From e961ec8ff5201fddd23ca0a1fd496f290174954c Mon Sep 17 00:00:00 2001
From: seoggyui <likppi10@gmail.com>
Date: Tue, 13 Sep 2022 02:50:14 +0900
Subject: [PATCH] =?UTF-8?q?#6=20remain=5Fui/=EB=82=A8=EC=9D=80=20ui=20:=20?=
 =?UTF-8?q?=EC=A7=80=EB=8F=84=20=EA=B2=80=EC=83=89=20=EA=B2=B0=EA=B3=BC=20?=
 =?UTF-8?q?=20-=20=EA=B2=80=EC=83=89=20=EA=B2=B0=EA=B3=BC=20=ED=83=80?=
 =?UTF-8?q?=EC=9E=85=20:=20=ED=85=8D=EC=8A=A4=ED=8A=B8=20>=20=EC=95=84?=
 =?UTF-8?q?=EC=9D=B4=EC=BD=98=20=EC=9D=B4=EB=AF=B8=EC=A7=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../SearchAddressBuildingActivity.kt          |  10 +---
 .../SearchAddressBuildingViewModel.kt         |   1 -
 .../main/res/drawable-xhdpi/icon_building.png | Bin 0 -> 382 bytes
 .../main/res/drawable-xhdpi/icon_location.png | Bin 0 -> 704 bytes
 app/src/main/res/drawable/icon_station.png    | Bin 0 -> 701 bytes
 ...st_item_address_building_search_result.xml |  47 +++++++++---------
 6 files changed, 26 insertions(+), 32 deletions(-)
 create mode 100644 app/src/main/res/drawable-xhdpi/icon_building.png
 create mode 100644 app/src/main/res/drawable-xhdpi/icon_location.png
 create mode 100644 app/src/main/res/drawable/icon_station.png

diff --git a/app/src/main/java/com/ftw/hometerview/ui/searchaddressbuilding/SearchAddressBuildingActivity.kt b/app/src/main/java/com/ftw/hometerview/ui/searchaddressbuilding/SearchAddressBuildingActivity.kt
index 48f0c82..8cc57f2 100644
--- a/app/src/main/java/com/ftw/hometerview/ui/searchaddressbuilding/SearchAddressBuildingActivity.kt
+++ b/app/src/main/java/com/ftw/hometerview/ui/searchaddressbuilding/SearchAddressBuildingActivity.kt
@@ -2,21 +2,16 @@ package com.ftw.hometerview.ui.searchaddressbuilding
 
 import android.content.Context
 import android.content.Intent
-import androidx.appcompat.app.AppCompatActivity
 import android.os.Bundle
-import android.os.Parcelable
-import android.util.Log
-import android.view.inputmethod.EditorInfo
+import androidx.appcompat.app.AppCompatActivity
 import androidx.lifecycle.Lifecycle
 import androidx.lifecycle.lifecycleScope
 import androidx.lifecycle.repeatOnLifecycle
 import com.ftw.hometerview.adapter.DataBindingRecyclerAdapter
 import com.ftw.hometerview.adapter.DividerItemDecoration
 import com.ftw.hometerview.databinding.ActivitySearchAddressBuildingBinding
-import com.ftw.hometerview.ui.searchcompanyresult.SearchCompanyResultActivity
 import dagger.hilt.android.AndroidEntryPoint
 import kotlinx.coroutines.launch
-import kotlinx.parcelize.Parcelize
 import javax.inject.Inject
 
 @AndroidEntryPoint
@@ -49,6 +44,7 @@ class SearchAddressBuildingActivity : AppCompatActivity() {
 
     private fun initList() {
         binding.searchResultRecyclerView.adapter = adapter
+        binding.searchResultRecyclerView.addItemDecoration(DividerItemDecoration(this))
     }
 
     private fun observe() {
@@ -59,7 +55,5 @@ class SearchAddressBuildingActivity : AppCompatActivity() {
                 }
             }
         }
-        
     }
-
 }
diff --git a/app/src/main/java/com/ftw/hometerview/ui/searchaddressbuilding/SearchAddressBuildingViewModel.kt b/app/src/main/java/com/ftw/hometerview/ui/searchaddressbuilding/SearchAddressBuildingViewModel.kt
index e8451e8..be3ecbc 100644
--- a/app/src/main/java/com/ftw/hometerview/ui/searchaddressbuilding/SearchAddressBuildingViewModel.kt
+++ b/app/src/main/java/com/ftw/hometerview/ui/searchaddressbuilding/SearchAddressBuildingViewModel.kt
@@ -1,6 +1,5 @@
 package com.ftw.hometerview.ui.searchaddressbuilding
 
-import android.util.Log
 import com.ftw.domain.usecase.searchaddressbuilding.GetSearchAddressBuildingUseCase
 import com.ftw.hometerview.BR
 import com.ftw.hometerview.R
diff --git a/app/src/main/res/drawable-xhdpi/icon_building.png b/app/src/main/res/drawable-xhdpi/icon_building.png
new file mode 100644
index 0000000000000000000000000000000000000000..a57f4ae605fff57763353501338f4d58f9e0f2ab
GIT binary patch
literal 382
zcmV-^0fGLBP)<h;3K|Lk000e1NJLTq001Tc001@!1^@s6tLy7E0003+Nkl<ZcwX(9
z&2hpo5JoA15-0@!oRHuoFBCutbU->t384e%06GXAPy!`@S8!ObtwcMMk?qXx%)6j(
z<u@Kn#`a_~wkoZgrGy{9QO>z(xqy9Ps(WGKk(e7E8y(tG7Oou)Nh!_xyCIh^s{;@9
zMQ+^Z`)qBee6Ux{`tHT%c2l+ndq%~isF;+Iiy1g(7PcV@Tb+4NwuB4MHG1kfc@HH@
zEMLKg4+bjh*qrOT$QRGi!Z~>l#fMak)c+R4iyJ2jf&U125B|n;l&%Fsi4;qZib)y0
z*sWf9=MXsF>ZzX_c<$F8LX_BGw+j^`_>hW``V+A}P%$YgCM8M?R~=?T<hDAsd*H%z
zl&+Obi4q&^cA;Vf9~!NgK8z4lOp1z0Q86hhCPl@hsF)NlHn`7%_AQ3>`jGJRtDz+L
c*H^H60wZWKXEuh>ga7~l07*qoM6N<$f>PF^IsgCw

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-xhdpi/icon_location.png b/app/src/main/res/drawable-xhdpi/icon_location.png
new file mode 100644
index 0000000000000000000000000000000000000000..cc65737dd548c37e0463bfb2bb7205e5347b9689
GIT binary patch
literal 704
zcmV;x0zdtUP)<h;3K|Lk000e1NJLTq001Tc001-y1^@s6<|9fz0007qNkl<ZcwWs|
z%TdEH5KRdwff6_av3<f$PO_Zb(*bk<9V8t<2hc%E2pzbDlmJ@U^296I(n^-en|U(~
z)_%0oew4*x0%Qfdd)VympNeg!2>-+Dq63U(&-^Vd%2S$`m$cx&M#^vHX|?9BQ5}Uy
zNN2DE&IBhbhV^;_b{pmpV$Q#UBbem7m(k-2ARIBa=Y%BR9<Z{h33nCS9Yt2~53D2>
z!4|e}M3Zs4f|#^MZdLF-7MhEL8QWwZud%>v%&QAyY>E9^B<u21TRbz9oE>^jwb9ZR
zS}972*w7KKfNDo@BrDjYXPN0m%_mymkTLWvV6(}FzhgNYL8eoZ67Lp7s1vq;oKWJf
zNx`NE8Ws%Dr(%N))-y&a^hgkLE`|nB`mGemit-zO7$VGF$euGOCnE(2JE@T^GLp61
zT_!C~L}Za2GGrMs=*E<bT^$R#UkW$tnCpF(i(MTPmHdqCkdfupS<`DEX)$oD(%V33
zd#!+5c!9lkK?J4kwF1=<e;A}_7e2L&5-p$<qE!BtHRYA#Gv`S`N=3e6Jveb*q19a*
z<VPum8QU-M2X{7)*z2T#znh7|xua<8b{3*!YKkI!>KyYK=wh*#`JVSI3bm|v?f`MA
zPcXM|oSA8456jMJI9MNH=E95T;^_49pGhznEd}^t4GYEQXtWe$Z}WUb`_dXMg*h{n
zG)lD@T4N;<sMjqUpaL5dO-kn@#GpRyDfIcNp$FF|7lrUk5w=4H+&9XD#YRyYey|O1
zOqdL$vD^thvwL)>6at)!=ahmxRzll?Q90zHOomH$m?Zmr057D}bhM(^2G^-jz}>m7
mb#Qdi?-K<u%V`e@Py7L%Mb~JMYL2A<0000<MNUMnLSTa8k~<^-

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable/icon_station.png b/app/src/main/res/drawable/icon_station.png
new file mode 100644
index 0000000000000000000000000000000000000000..971e6df86e5f80d1bae576d9126af3aacb977f39
GIT binary patch
literal 701
zcmV;u0z&<XP)<h;3K|Lk000e1NJLTq001rk001-y1^@s6_4EqL0007nNkl<ZcwX&U
z-BH6Z4DJXWff4!)G|3%z&CgSQ+Gn}}Yycb34az1Rp={t0Is!yW9H=5YPUEC0m+$U-
zLALbOSdnbcW`^*B_-+}bTQ5v@UXbp4Vc~mwA8i&iek;UrJoi@Vn;WDe=l8%Aj=y<<
z1*5vOK*4@;VjK=m&_eaq0Kd=;k^`MQ0t)5o7oxASElkOa2Lm&BY!r}tmFO}F>7Y^4
ziPHC5TkV2=c0$pQ!P=`CM@|&}5T>uxFm|GF*fZ1sT!vX(?IlAjHH!e1myT}&%;D+@
z8ad%mf{71fIAON4>W|T<G+eSe61Yk|`$NMdyaX4>wm&pX!b@<0Z2LpQB)kL{$hJQ;
zOu|cWfo%Ij!z8=}7s$3hH2f>!@VE2n=5WH~lltq_WHJ5<10x&=Eh_P$1)K%pE`<8&
z!ygV%2_G{j;X|`ocz$dGI~?QSP+exYsEzB$Wtbcw2OtK<DH2l9agt5K`J1Dec1~-m
zzF@kWH5{N4p%N`&<Bkzln)>|<6mR>mY~wx#d{Dm>+~K=0Fv3kLT^w)cbY5GY-2*Dn
zs&d|}@Vw0K$ov|H+bW8Z&;25}SZqp8&S86YNKP->ET{qK`Poq=-sZKm>Zt_Zpn~*^
zjt5qQG@mvh3xj-l(~P~GesYvAZoq~&C{YQwv0sN`?J|~2(y>uhWk)SuDO#eu;}&${
z)tK*f<3k80qLt5G2SR6>*AtT>RfGJJKr^Jta(l$pEn3`*1glW|C$iYJyOo6e+|qc~
zpzD!4QrY`=#?vZ$?sdCho6+3dwSwcXKWc$`qN)XG1xS!yN_-=eL#M6d_OqW&`P-AU
j1yn09O83{Gu2TL0ivik(EXv+n00000NkvXXu0mjfCP7Ii

literal 0
HcmV?d00001

diff --git a/app/src/main/res/layout/list_item_address_building_search_result.xml b/app/src/main/res/layout/list_item_address_building_search_result.xml
index e7d7b3c..9363c0c 100644
--- a/app/src/main/res/layout/list_item_address_building_search_result.xml
+++ b/app/src/main/res/layout/list_item_address_building_search_result.xml
@@ -20,46 +20,47 @@
         android:paddingBottom="@dimen/dp_size_10"
         >
 
+        <ImageView
+            android:id="@+id/result_type_textview"
+            android:layout_width="@dimen/dp_size_24"
+            android:layout_height="@dimen/dp_size_24"
+            android:src="@{searchResult.type.equals(@string/building_text) ? @drawable/icon_building : searchResult.type.equals(@string/location_text) ? @drawable/icon_location : @drawable/icon_station}"
+            android:layout_marginStart="@dimen/dp_size_16"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            />
+
         <TextView
-            android:id="@+id/company_textview"
-            android:layout_width="match_parent"
+            android:id="@+id/result_name_textview"
+            android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:layout_marginStart="@dimen/dp_size_16"
-            android:layout_marginTop="@dimen/dp_size_16"
-            android:layout_marginEnd="@dimen/dp_size_16"
+            android:layout_marginTop="@dimen/dp_size_4"
             android:fontFamily="@font/pretendard_semibold"
             android:text="@{searchResult.result}"
             android:textColor="@color/black"
             android:textSize="@dimen/sp_size_16"
-            app:layout_constraintStart_toStartOf="parent"
+            android:layout_marginStart="@dimen/dp_size_16"
+            app:layout_constraintStart_toEndOf="@+id/result_type_textview"
             app:layout_constraintTop_toTopOf="parent"
             tools:text="삼성전자"
             />
 
         <TextView
-            android:id="@+id/address_textview"
+            android:id="@+id/result_address_textview"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:text="@{searchResult.address}"
-            android:visibility="@{searchResult.type.toString().equals(@string/building_text)  ? View.VISIBLE : View.GONE}"
+            android:layout_marginBottom="@dimen/dp_size_4"
             android:fontFamily="@font/pretendard_medium"
+            android:text="@{searchResult.address}"
             android:textColor="@color/blue_300"
             android:textSize="@dimen/sp_size_13"
-            app:layout_constraintEnd_toEndOf="@id/company_textview"
-            app:layout_constraintStart_toStartOf="@id/company_textview"
-            app:layout_constraintTop_toBottomOf="@id/company_textview"
-            tools:text="서울시 마포구 흥정로 32, 34"
-            />
-
-        <TextView
-            android:id="@+id/type_text"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginEnd="16dp"
-            android:text="@{searchResult.type}"
+            android:layout_marginStart="@dimen/dp_size_16"
+            android:visibility="@{searchResult.type.toString().equals(@string/building_text)  ? View.VISIBLE : View.GONE}"
             app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintStart_toEndOf="@+id/result_type_textview"
+            app:layout_constraintTop_toBottomOf="@id/result_name_textview"
+            tools:text="서울시 마포구 흥정로 32, 34"
             />
 
     </androidx.constraintlayout.widget.ConstraintLayout>