Skip to content

[Feat/#58] 허드 등록 화면 ui 변경사항 추가 #59

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
1971123-seongmin wants to merge 2 commits into
base: develop
Choose a base branch
from
Open

[Feat/#58] 허드 등록 화면 ui 변경사항 추가 #59

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1067445
Feat: 이미지 추가
1971123-seongmin Mar 12, 2025
37c253a
Feat: 허브 등록 블루투스 연결 화면 이전, 다음 버튼 추가
1971123-seongmin Mar 12, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions .../example/eldercare/presentation/ui/devicemanage/add/hub/AddHubConnectBluetoothFragment.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,10 @@ class AddHubConnectBluetoothFragment : BaseFragment<FragmentAddHubBluetoothConne

private fun addListener() {
with(binding) {
// 임시
tvAddHubBluetoothConnectTitle.setOnClickListener {
btnAddHubBluetoothConnectPrevious.setOnClickListener {
findNavController().popBackStack()
}
btnAddHubBluetoothConnectNext.setOnClickListener {
navigateToAddHubConnectWifiFragment()
}
}
Expand Down
62 changes: 62 additions & 0 deletions app/src/main/res/drawable/ic_install_hub_guide_1.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,62 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="360dp"
android:height="337dp"
android:viewportWidth="360"
android:viewportHeight="337">
<group>
<clip-path
android:pathData="M0,0.35h360v336h-360z"/>
<path
android:pathData="M-38,225.06H398"
android:strokeWidth="3"
android:fillColor="#00000000"
android:strokeColor="#369965"/>
<path
android:pathData="M251.85,75.55H108.14V127.23H251.85V75.55Z"
android:strokeLineJoin="round"
android:strokeWidth="2.66667"
android:fillColor="#ffffff"
android:strokeColor="#369965"
android:strokeLineCap="round"/>
<path
android:pathData="M263.39,127.23H96.62C88.77,127.23 82.42,133.07 82.42,140.26V245.1H277.58V140.26C277.58,133.07 271.22,127.23 263.39,127.23Z"
android:strokeLineJoin="round"
android:strokeWidth="2.66667"
android:fillColor="#ffffff"
android:strokeColor="#369965"
android:strokeLineCap="round"/>
<path
android:pathData="M82.42,245.1V253.27C82.42,257.87 86.48,261.6 91.49,261.6H268.53C273.54,261.6 277.6,257.87 277.6,253.27V245.1H82.42Z"
android:strokeLineJoin="round"
android:strokeWidth="2.66667"
android:fillColor="#369965"
android:strokeColor="#369965"
android:strokeLineCap="round"/>
<path
android:pathData="M200.9,172.02H160.21C154.35,172.02 149.6,176.77 149.6,182.63C149.6,188.49 154.35,193.24 160.21,193.24H200.9C206.76,193.24 211.51,188.49 211.51,182.63C211.51,176.77 206.76,172.02 200.9,172.02Z"
android:strokeAlpha="0.54"
android:fillColor="#369965"
android:fillAlpha="0.54"/>
<path
android:pathData="M200.03,172.02H159.99C154.13,172.02 149.38,176.77 149.38,182.63C149.38,188.49 154.13,193.24 159.99,193.24H200.03C205.89,193.24 210.64,188.49 210.64,182.63C210.64,176.77 205.89,172.02 200.03,172.02Z"
android:strokeLineJoin="round"
android:strokeWidth="2.66667"
android:fillColor="#00000000"
android:strokeColor="#369965"
android:strokeLineCap="round"/>
<path
android:pathData="M253.38,68.46H106.62C103.21,68.46 100.44,71.24 100.44,74.68C100.44,78.12 103.21,80.9 106.62,80.9H253.38C256.79,80.9 259.56,78.12 259.56,74.68C259.56,71.24 256.79,68.46 253.38,68.46Z"
android:strokeLineJoin="round"
android:strokeWidth="1.77778"
android:fillColor="#369965"
android:strokeColor="#369965"
android:strokeLineCap="round"/>
<path
android:pathData="M180,112.22C185.21,112.22 189.43,108 189.43,102.79C189.43,97.58 185.21,93.35 180,93.35C174.79,93.35 170.57,97.58 170.57,102.79C170.57,108 174.79,112.22 180,112.22Z"
android:strokeLineJoin="round"
android:strokeWidth="2.66667"
android:fillColor="#FCBDBD"
android:strokeColor="#369965"
android:strokeLineCap="round"/>
</group>
</vector>
88 changes: 88 additions & 0 deletions app/src/main/res/drawable/ic_install_hub_guide_connect_power.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,88 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="185dp"
android:height="319dp"
android:viewportWidth="185"
android:viewportHeight="319">
<group>
<clip-path
android:pathData="M0,0h185v319h-185z"/>
<group>
<clip-path
android:pathData="M0,38.61h106.24v179.28h-106.24z"/>
<path
android:pathData="M57.53,38.61H2.65C1.18,38.61 0,40.05 0,41.84V142.18C0,143.96 1.18,145.41 2.65,145.41H57.53C58.99,145.41 60.17,143.96 60.17,142.18V41.84C60.17,40.05 58.99,38.61 57.53,38.61Z"
android:fillColor="#369965"/>
<path
android:pathData="M54.27,43.64H5.91C4.92,43.64 4.12,44.62 4.12,45.83V138.19C4.12,139.39 4.92,140.37 5.91,140.37H54.27C55.25,140.37 56.05,139.39 56.05,138.19V45.83C56.05,44.62 55.25,43.64 54.27,43.64Z"
android:fillColor="#ffffff"/>
<path
android:pathData="M42.86,116.06V108.5C42.86,103.63 39.63,99.69 35.65,99.69H24.52C20.54,99.69 17.31,103.63 17.31,108.5V116.06C17.31,120.93 20.54,124.88 24.52,124.88H35.65C39.63,124.88 42.86,120.93 42.86,116.06Z"
android:fillColor="#ffffff"/>
<path
android:pathData="M14.22,70.01a15.89,19.24 0,1 0,31.79 0a15.89,19.24 0,1 0,-31.79 0z"
android:fillColor="#369965"/>
<path
android:pathData="M14.22,115.59a15.89,19.24 0,1 0,31.79 0a15.89,19.24 0,1 0,-31.79 0z"
android:fillColor="#369965"/>
<path
android:pathData="M16.73,115.58a13.38,16.21 0,1 0,26.77 0a13.38,16.21 0,1 0,-26.77 0z"
android:fillColor="#ffffff"/>
<path
android:pathData="M19.24,115.58a10.87,13.17 0,1 0,21.75 0a10.87,13.17 0,1 0,-21.75 0z"
android:fillColor="#369965"/>
<path
android:pathData="M23.39,73.01C24.75,73.01 25.86,71.66 25.86,69.99C25.86,68.32 24.75,66.97 23.39,66.97C22.02,66.97 20.91,68.32 20.91,69.99C20.91,71.66 22.02,73.01 23.39,73.01Z"
android:fillColor="#ffffff"/>
<path
android:pathData="M36.77,73.01C38.13,73.01 39.24,71.66 39.24,69.99C39.24,68.32 38.13,66.97 36.77,66.97C35.4,66.97 34.29,68.32 34.29,69.99C34.29,71.66 35.4,73.01 36.77,73.01Z"
android:fillColor="#ffffff"/>
<path
android:pathData="M105.4,214.45C105.4,213.15 104.53,212.08 103.45,212.03C39.78,209.23 51.73,163.01 52.79,139.95C53.6,122.52 39.71,116.73 35.04,114.49C34.11,114.04 33.13,113.73 32.14,113.6C31.14,113.48 30.02,113.56 29.51,114.78C29.3,115.28 29.25,115.78 29.29,116.27C29.37,117.46 30.15,118.41 31.11,118.65C35.41,119.71 49.86,124.84 49.18,140.44C48.38,158.66 32.62,213.92 103.31,216.87C104.45,216.92 105.4,215.83 105.4,214.45Z"
android:strokeLineJoin="round"
android:strokeWidth="1.97143"
android:fillColor="#ffffff"
android:strokeColor="#369965"
android:strokeLineCap="round"/>
<path
android:pathData="M29.57,48.22L30.65,48.22A1.48,1.48 0,0 1,32.13 49.7L32.13,56.89A1.48,1.48 0,0 1,30.65 58.37L29.57,58.37A1.48,1.48 0,0 1,28.1 56.89L28.1,49.7A1.48,1.48 0,0 1,29.57 48.22z"
android:strokeLineJoin="round"
android:strokeWidth="0.985717"
android:fillColor="#00000000"
android:strokeColor="#ffffff"/>
<path
android:pathData="M29.57,82.65L30.65,82.65A1.48,1.48 0,0 1,32.13 84.13L32.13,91.33A1.48,1.48 0,0 1,30.65 92.81L29.57,92.81A1.48,1.48 0,0 1,28.1 91.33L28.1,84.13A1.48,1.48 0,0 1,29.57 82.65z"
android:strokeLineJoin="round"
android:strokeWidth="0.985717"
android:fillColor="#00000000"
android:strokeColor="#ffffff"/>
</group>
<path
android:pathData="M310.7,60.37H145.67V119.75H310.7V60.37Z"
android:strokeLineJoin="round"
android:strokeWidth="2.95715"
android:fillColor="#ffffff"
android:strokeColor="#369965"
android:strokeLineCap="round"/>
<path
android:pathData="M323.95,119.75H132.44C123.43,119.75 116.13,126.46 116.13,134.72V255.17H340.25V134.72C340.25,126.46 332.94,119.75 323.95,119.75Z"
android:strokeLineJoin="round"
android:strokeWidth="2.95715"
android:fillColor="#ffffff"
android:strokeColor="#369965"
android:strokeLineCap="round"/>
<path
android:pathData="M116.13,255.17V264.56C116.13,269.84 120.8,274.12 126.55,274.12H329.85C335.61,274.12 340.27,269.84 340.27,264.56V255.17H116.13Z"
android:strokeLineJoin="round"
android:strokeWidth="2.95715"
android:fillColor="#369965"
android:strokeColor="#369965"
android:strokeLineCap="round"/>
<path
android:pathData="M312.46,52.22H143.92C140.01,52.22 136.83,55.43 136.83,59.37C136.83,63.32 140.01,66.52 143.92,66.52H312.46C316.38,66.52 319.55,63.32 319.55,59.37C319.55,55.43 316.38,52.22 312.46,52.22Z"
android:strokeLineJoin="round"
android:strokeWidth="1.97143"
android:fillColor="#369965"
android:strokeColor="#369965"
android:strokeLineCap="round"/>
</group>
</vector>
71 changes: 71 additions & 0 deletions app/src/main/res/drawable/ic_install_hub_guide_wifi.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,71 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="360dp"
android:height="336dp"
android:viewportWidth="360"
android:viewportHeight="336">
<path
android:pathData="M251.85,113.78H108.14V165.46H251.85V113.78Z"
android:strokeLineJoin="round"
android:strokeWidth="2.66667"
android:fillColor="#ffffff"
android:strokeColor="#369965"
android:strokeLineCap="round"/>
<path
android:pathData="M263.39,165.46H96.62C88.77,165.46 82.42,171.3 82.42,178.49V283.33H277.58V178.49C277.58,171.3 271.22,165.46 263.39,165.46Z"
android:strokeLineJoin="round"
android:strokeWidth="2.66667"
android:fillColor="#ffffff"
android:strokeColor="#369965"
android:strokeLineCap="round"/>
<path
android:pathData="M82.42,283.33V291.5C82.42,296.1 86.48,299.83 91.49,299.83H268.53C273.54,299.83 277.6,296.1 277.6,291.5V283.33H82.42Z"
android:strokeLineJoin="round"
android:strokeWidth="2.66667"
android:fillColor="#369965"
android:strokeColor="#369965"
android:strokeLineCap="round"/>
<path
android:pathData="M200.9,210.24H160.21C154.35,210.24 149.6,214.99 149.6,220.85C149.6,226.71 154.35,231.47 160.21,231.47H200.9C206.76,231.47 211.51,226.71 211.51,220.85C211.51,214.99 206.76,210.24 200.9,210.24Z"
android:strokeAlpha="0.54"
android:fillColor="#369965"
android:fillAlpha="0.54"/>
<path
android:pathData="M200.03,210.24H159.99C154.13,210.24 149.38,214.99 149.38,220.85C149.38,226.71 154.13,231.47 159.99,231.47H200.03C205.89,231.47 210.64,226.71 210.64,220.85C210.64,214.99 205.89,210.24 200.03,210.24Z"
android:strokeLineJoin="round"
android:strokeWidth="2.66667"
android:fillColor="#00000000"
android:strokeColor="#369965"
android:strokeLineCap="round"/>
<path
android:pathData="M253.38,106.69H106.62C103.21,106.69 100.44,109.47 100.44,112.91C100.44,116.35 103.21,119.13 106.62,119.13H253.38C256.79,119.13 259.56,116.35 259.56,112.91C259.56,109.47 256.79,106.69 253.38,106.69Z"
android:strokeLineJoin="round"
android:strokeWidth="1.77778"
android:fillColor="#369965"
android:strokeColor="#369965"
android:strokeLineCap="round"/>
<path
android:pathData="M180,150.45C185.21,150.45 189.43,146.23 189.43,141.02C189.43,135.81 185.21,131.58 180,131.58C174.79,131.58 170.57,135.81 170.57,141.02C170.57,146.23 174.79,150.45 180,150.45Z"
android:strokeLineJoin="round"
android:strokeWidth="2.66667"
android:fillColor="#FCBDBD"
android:strokeColor="#369965"
android:strokeLineCap="round"/>
<path
android:pathData="M180.56,36.14C191.06,36.14 200.64,40.1 207.89,46.59C209.06,47.64 210.84,47.6 211.93,46.46L217.62,40.53C218.74,39.36 218.7,37.48 217.49,36.39C207.73,27.54 194.78,22.14 180.56,22.14C166.34,22.14 153.39,27.54 143.63,36.39C142.43,37.48 142.38,39.36 143.5,40.53L149.19,46.46C150.28,47.59 152.06,47.64 153.23,46.59C160.48,40.09 170.06,36.14 180.56,36.14Z"
android:fillColor="#3EB473"/>
<path
android:pathData="M180.56,54.14C186.27,54.14 191.49,56.22 195.51,59.66C196.67,60.65 198.4,60.56 199.46,59.46L203.77,54.97C204.9,53.8 204.86,51.9 203.63,50.83C197.47,45.42 189.4,42.14 180.56,42.14C171.72,42.14 163.65,45.42 157.49,50.83C156.27,51.9 156.23,53.8 157.35,54.97L161.66,59.46C162.72,60.56 164.45,60.66 165.61,59.66C169.63,56.22 174.85,54.14 180.56,54.14Z"
android:fillColor="#3EB473"/>
<path
android:pathData="M180.56,54.14C186.27,54.14 191.49,56.22 195.51,59.66C196.67,60.65 198.4,60.56 199.46,59.46L203.77,54.97C204.9,53.8 204.86,51.9 203.63,50.83C197.47,45.42 189.4,42.14 180.56,42.14C171.72,42.14 163.65,45.42 157.49,50.83C156.27,51.9 156.23,53.8 157.35,54.97L161.66,59.46C162.72,60.56 164.45,60.66 165.61,59.66C169.63,56.22 174.85,54.14 180.56,54.14Z"
android:fillColor="#3EB473"/>
<path
android:pathData="M191.91,67.31C193.07,66.1 192.99,64.13 191.68,63.08C188.63,60.65 184.76,59.19 180.57,59.19C176.37,59.19 172.49,60.65 169.45,63.08C168.13,64.12 168.05,66.1 169.21,67.31L178.49,76.96C179.63,78.15 181.52,78.15 182.66,76.96L191.93,67.31H191.91Z"
android:fillColor="#3EB473"/>
<path
android:pathData="M191.91,67.31C193.07,66.1 192.99,64.13 191.68,63.08C188.63,60.65 184.76,59.19 180.57,59.19C176.37,59.19 172.49,60.65 169.45,63.08C168.13,64.12 168.05,66.1 169.21,67.31L178.49,76.96C179.63,78.15 181.52,78.15 182.66,76.96L191.93,67.31H191.91Z"
android:fillColor="#3EB473"/>
<path
android:pathData="M180.56,36.14C191.06,36.14 200.64,40.1 207.89,46.59C209.06,47.64 210.84,47.6 211.93,46.46L217.62,40.53C218.74,39.36 218.7,37.48 217.49,36.39C207.73,27.54 194.78,22.14 180.56,22.14C166.34,22.14 153.39,27.54 143.63,36.39C142.43,37.48 142.38,39.36 143.5,40.53L149.19,46.46C150.28,47.59 152.06,47.64 153.23,46.59C160.48,40.09 170.06,36.14 180.56,36.14Z"
android:fillColor="#3EB473"/>
</vector>
45 changes: 45 additions & 0 deletions app/src/main/res/layout/fragment_add_hub_bluetooth_connect.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,13 @@
android:layout_height="match_parent"
xmlns:app="http://schemas.android.com/apk/res-auto">

<androidx.constraintlayout.widget.Guideline
android:id="@+id/gl_add_hub_bluetooth_connect_vertical"
android:layout_width="match_parent"
android:layout_height="1dp"
android:orientation="vertical"
app:layout_constraintGuide_percent="0.5" />

<TextView
android:id="@+id/tv_add_hub_bluetooth_connect_title"
style="@style/TextAppearance.Title1"
Expand Down Expand Up @@ -58,4 +65,42 @@

</androidx.constraintlayout.widget.ConstraintLayout>

<com.google.android.material.button.MaterialButton
android:id="@+id/btn_add_hub_bluetooth_connect_previous"
style="@style/Theme.ElderCare.Button.Capsule"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:backgroundTint="@color/white"
android:text="@string/input_name_previous_btn"
android:textAppearance="@style/TextAppearance.SubTitle5"
android:textColor="@color/primary"
android:singleLine="true"
android:paddingVertical="@dimen/padding_m"
android:layout_marginStart="@dimen/spacing4"
android:layout_marginEnd="6dp"
android:layout_marginBottom="@dimen/spacing4"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@+id/gl_add_hub_bluetooth_connect_vertical"
app:layout_constraintStart_toStartOf="parent"
app:strokeColor="@color/primary"
app:strokeWidth="1dp" />

<com.google.android.material.button.MaterialButton
android:id="@+id/btn_add_hub_bluetooth_connect_next"
style="@style/Theme.ElderCare.Button.L"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:backgroundTint="@color/primary"
android:text="@string/input_name_next_btn"
android:textAppearance="@style/TextAppearance.SubTitle5"
android:textColor="@color/white"
android:singleLine="true"
android:paddingVertical="@dimen/padding_m"
android:layout_marginStart="6dp"
android:layout_marginEnd="@dimen/spacing4"
android:layout_marginBottom="@dimen/spacing4"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="@+id/gl_add_hub_bluetooth_connect_vertical" />

</androidx.constraintlayout.widget.ConstraintLayout>
1 change: 1 addition & 0 deletions app/src/main/res/layout/fragment_add_hub_connect_power.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="56dp"
android:src="@drawable/ic_install_hub_guide_connect_power"
android:contentDescription="@string/add_power_guide_image_content_description"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
Expand Down
1 change: 1 addition & 0 deletions app/src/main/res/layout/fragment_add_hub_guide_seconed.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
android:id="@+id/tv_add_hub_guide_second_guide_image"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/ic_install_hub_guide_1"
android:contentDescription="@string/add_hub_guide_image_content_description"
android:layout_marginTop="78dp"
android:layout_marginHorizontal="44dp"
Expand Down
1 change: 1 addition & 0 deletions app/src/main/res/layout/fragment_select_hub_place_guide.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,7 @@
android:id="@+id/tv_select_hub_place_guide_image"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/ic_install_hub_guide_wifi"
android:contentDescription="@string/add_hub_guide_image_content_description"
android:layout_marginTop="44dp"
android:layout_marginHorizontal="44dp"
Expand Down
Loading