From c56e8d20703b6e760dd4af23592577c7ce2246b8 Mon Sep 17 00:00:00 2001 From: Hyobeen-Park Date: Wed, 17 Aug 2022 22:10:20 +0900 Subject: [PATCH 01/21] fix bug column scrab data onDestroy -> onStop --- .idea/deploymentTargetDropDown.xml | 17 ----- .idea/misc.xml | 63 +++++++------------ .../com/example/mapforgirls/MainActivity.kt | 4 +- .../res/layout/activity_chatting_detail.xml | 2 +- 4 files changed, 27 insertions(+), 59 deletions(-) delete mode 100644 .idea/deploymentTargetDropDown.xml diff --git a/.idea/deploymentTargetDropDown.xml b/.idea/deploymentTargetDropDown.xml deleted file mode 100644 index 4cdb5b8..0000000 --- a/.idea/deploymentTargetDropDown.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml index 13409e0..0f7e53f 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -7,9 +7,9 @@ - + - + @@ -24,17 +24,10 @@ - - - - - - - @@ -44,38 +37,11 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -94,18 +60,37 @@ + - - + + + + + + + + + + + + + - + + + + + + + + diff --git a/app/src/main/java/com/example/mapforgirls/MainActivity.kt b/app/src/main/java/com/example/mapforgirls/MainActivity.kt index d5ce81b..3df8cab 100644 --- a/app/src/main/java/com/example/mapforgirls/MainActivity.kt +++ b/app/src/main/java/com/example/mapforgirls/MainActivity.kt @@ -55,8 +55,8 @@ class MainActivity : AppCompatActivity() { initBottomNavigation() } - override fun onDestroy() { - super.onDestroy() + override fun onStop() { + super.onStop() initScrapDB() diff --git a/app/src/main/res/layout/activity_chatting_detail.xml b/app/src/main/res/layout/activity_chatting_detail.xml index fae8513..6e384df 100644 --- a/app/src/main/res/layout/activity_chatting_detail.xml +++ b/app/src/main/res/layout/activity_chatting_detail.xml @@ -68,7 +68,7 @@ From 2facf38872ec6c282c9be16fd5d2981c000bd074 Mon Sep 17 00:00:00 2001 From: Songjeongyeon Date: Thu, 18 Aug 2022 00:06:50 +0900 Subject: [PATCH 02/21] =?UTF-8?q?=EC=B1=84=ED=8C=85=20=EB=94=94=EC=9E=90?= =?UTF-8?q?=EC=9D=B8=20&=20=EB=A1=9C=EA=B7=B8=EC=9D=B8=20=EB=94=94?= =?UTF-8?q?=EC=9E=90=EC=9D=B8=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .idea/gradle.xml | 1 + .idea/misc.xml | 18 +-- .../com/example/mapforgirls/MapsFragment.kt | 116 +++++++++--------- app/src/main/res/drawable/ic_hambuger.png | Bin 0 -> 569 bytes app/src/main/res/drawable/ic_search.png | Bin 0 -> 1746 bytes .../main/res/drawable/round_white_50dp.xml | 11 ++ .../res/layout/activity_chatting_detail.xml | 53 +++++--- app/src/main/res/layout/activity_login.xml | 37 +++--- app/src/main/res/layout/item_message.xml | 22 +++- 9 files changed, 151 insertions(+), 107 deletions(-) create mode 100644 app/src/main/res/drawable/ic_hambuger.png create mode 100644 app/src/main/res/drawable/ic_search.png create mode 100644 app/src/main/res/drawable/round_white_50dp.xml diff --git a/.idea/gradle.xml b/.idea/gradle.xml index 7b46144..e9969a1 100644 --- a/.idea/gradle.xml +++ b/.idea/gradle.xml @@ -14,6 +14,7 @@ + diff --git a/.idea/misc.xml b/.idea/misc.xml index 13409e0..901bc58 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -24,7 +24,6 @@ - @@ -35,20 +34,18 @@ + + + - - - - - - + - + @@ -62,10 +59,6 @@ - - - - @@ -74,6 +67,7 @@ + diff --git a/app/src/main/java/com/example/mapforgirls/MapsFragment.kt b/app/src/main/java/com/example/mapforgirls/MapsFragment.kt index 2ea80e2..f6199a6 100644 --- a/app/src/main/java/com/example/mapforgirls/MapsFragment.kt +++ b/app/src/main/java/com/example/mapforgirls/MapsFragment.kt @@ -93,19 +93,19 @@ class MapsFragment : Fragment() { } // current marker - binding.mylocationButton.setOnClickListener { - var currentLocation : LatLng = getLocation() - if(currentLocation != LatLng(0.0, 0.0)) { // 현재 위치 제대로 받아왔을 때 - val markerOptions = MarkerOptions() - markerOptions.title("현재 위치") - markerOptions.icon(BitmapDescriptorFactory.fromBitmap(BitmapUtils.resizeMapIcons(requireContext(), R.drawable.marker, markerIconSize, markerIconSize))) - googleMap.addMarker(markerOptions.position(currentLocation)) - - moveCamera(googleMap, currentLocation.latitude, currentLocation.longitude) - - googleMap!!.setOnMarkerClickListener(null) - } - } +// binding.mylocationButton.setOnClickListener { +// var currentLocation : LatLng = getLocation() +// if(currentLocation != LatLng(0.0, 0.0)) { // 현재 위치 제대로 받아왔을 때 +// val markerOptions = MarkerOptions() +// markerOptions.title("현재 위치") +// markerOptions.icon(BitmapDescriptorFactory.fromBitmap(BitmapUtils.resizeMapIcons(requireContext(), R.drawable.marker, markerIconSize, markerIconSize))) +// googleMap.addMarker(markerOptions.position(currentLocation)) +// +// moveCamera(googleMap, currentLocation.latitude, currentLocation.longitude) +// +// googleMap!!.setOnMarkerClickListener(null) +// } +// } cardView.visibility = View.GONE @@ -156,7 +156,7 @@ class MapsFragment : Fragment() { ): View? { binding = FragmentMapsBinding.inflate(inflater, container, false) - getLocation() +// getLocation() return binding.root } @@ -168,52 +168,52 @@ class MapsFragment : Fragment() { } - private fun getLocation() : LatLng { - locationManager = mainActivity.getSystemService(LOCATION_SERVICE) as LocationManager? - var userLocation: Location = getLatLng() - if(userLocation != null){ - latitude = userLocation.latitude - longitude = userLocation.longitude - Log.d("CheckCurrentLocation", "현재 내 위치 값: ${latitude}, ${longitude}") - -// var mGeoCoder = Geocoder(mainActivity.applicationContext, Locale.KOREAN) -// var mResultList: List
? = null -// try{ -// mResultList = mGeoCoder.getFromLocation( -// latitude!!, longitude!!, 1 -// ) -// }catch(e: IOException){ -// e.printStackTrace() -// } -// if(mResultList != null){ -// Log.d("CheckCurrentLocation", mResultList[0].getAddressLine(0)) +// private fun getLocation() : LatLng { +// locationManager = mainActivity.getSystemService(LOCATION_SERVICE) as LocationManager? +// var userLocation: Location = getLatLng() +// if(userLocation != null){ +// latitude = userLocation.latitude +// longitude = userLocation.longitude +// Log.d("CheckCurrentLocation", "현재 내 위치 값: ${latitude}, ${longitude}") +// +//// var mGeoCoder = Geocoder(mainActivity.applicationContext, Locale.KOREAN) +//// var mResultList: List
? = null +//// try{ +//// mResultList = mGeoCoder.getFromLocation( +//// latitude!!, longitude!!, 1 +//// ) +//// }catch(e: IOException){ +//// e.printStackTrace() +//// } +//// if(mResultList != null){ +//// Log.d("CheckCurrentLocation", mResultList[0].getAddressLine(0)) +//// +//// } +// } +// return LatLng(latitude, longitude) +// } // +// private fun getLatLng(): Location { +// var currentLatLng: Location? = null +// var hasFineLocationPermission = ContextCompat.checkSelfPermission(mainActivity, +// Manifest.permission.ACCESS_FINE_LOCATION) +// var hasCoarseLocationPermission = ContextCompat.checkSelfPermission(mainActivity, +// Manifest.permission.ACCESS_COARSE_LOCATION) +// +// if(hasFineLocationPermission == PackageManager.PERMISSION_GRANTED && +// hasCoarseLocationPermission == PackageManager.PERMISSION_GRANTED){ +// currentLatLng = locationManager?.getLastKnownLocation(LocationManager.GPS_PROVIDER) ?: locationManager?.getLastKnownLocation(LocationManager.NETWORK_PROVIDER) +// }else{ +// if(ActivityCompat.shouldShowRequestPermissionRationale(mainActivity, REQUIRED_PERMISSIONS[0])){ +// Toast.makeText(mainActivity, "앱을 실행하려면 위치 접근 권한이 필요합니다.", Toast.LENGTH_SHORT).show() +// ActivityCompat.requestPermissions(mainActivity, REQUIRED_PERMISSIONS, PERMISSIONS_REQUEST_CODE) +// }else{ +// ActivityCompat.requestPermissions(mainActivity, REQUIRED_PERMISSIONS, PERMISSIONS_REQUEST_CODE) // } - } - return LatLng(latitude, longitude) - } - - private fun getLatLng(): Location { - var currentLatLng: Location? = null - var hasFineLocationPermission = ContextCompat.checkSelfPermission(mainActivity, - Manifest.permission.ACCESS_FINE_LOCATION) - var hasCoarseLocationPermission = ContextCompat.checkSelfPermission(mainActivity, - Manifest.permission.ACCESS_COARSE_LOCATION) - - if(hasFineLocationPermission == PackageManager.PERMISSION_GRANTED && - hasCoarseLocationPermission == PackageManager.PERMISSION_GRANTED){ - currentLatLng = locationManager?.getLastKnownLocation(LocationManager.GPS_PROVIDER) ?: locationManager?.getLastKnownLocation(LocationManager.NETWORK_PROVIDER) - }else{ - if(ActivityCompat.shouldShowRequestPermissionRationale(mainActivity, REQUIRED_PERMISSIONS[0])){ - Toast.makeText(mainActivity, "앱을 실행하려면 위치 접근 권한이 필요합니다.", Toast.LENGTH_SHORT).show() - ActivityCompat.requestPermissions(mainActivity, REQUIRED_PERMISSIONS, PERMISSIONS_REQUEST_CODE) - }else{ - ActivityCompat.requestPermissions(mainActivity, REQUIRED_PERMISSIONS, PERMISSIONS_REQUEST_CODE) - } - currentLatLng = getLatLng() - } - return currentLatLng!! - } +// currentLatLng = getLatLng() +// } +// return currentLatLng!! +// } override fun onRequestPermissionsResult(requestCode: Int, permissions: Array, grantResults: IntArray) { super.onRequestPermissionsResult(requestCode, permissions, grantResults) diff --git a/app/src/main/res/drawable/ic_hambuger.png b/app/src/main/res/drawable/ic_hambuger.png new file mode 100644 index 0000000000000000000000000000000000000000..f6b04a21b04e075151a8bc5a6fc45cf9a63bff87 GIT binary patch literal 569 zcmV-90>=G`P)u?HWe~`SZV>4NZh{D^ES*4cnIMA12uaE~C$LooQ5qjXz5(GMz@7I9 zEbPYO?s%854cm?3mNQ>LaKVbiVwO9PB;4x!U-Te6A)t$f6B5TH2ge_$%QU8R=&Tld z@pJ-ZNU(P@__j-1s~;nQ>_aID*yT7i)Xjj0h_TI(=GTB{^f*?961tUXCKOOC*26=t zd^T1*8%po1oX>|}ToCGukb@#3;sU6DKFl3Gys)+U`5~^IZ8V$^+{ve}M=-`1V~jDz z7-L@Sek+}F2MV+;MD5s%ZlS>_pvc1JPZ4_w^*9|m{}yu)&7h4)ema=W)#ncI(oea= z4m8VXmb%S7=w`VCEO)3C91BAZ#VWrU^XYK9CQljzm@;M$qer>J+rPisjL;*N_l z9Mri(tP68!6z{uUBJaj2cgWaJh?@Rm7^U|E$Ha$s|2*6P9g@HE9gU}800000NkvXX Hu0mjfr?m4L literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable/ic_search.png b/app/src/main/res/drawable/ic_search.png new file mode 100644 index 0000000000000000000000000000000000000000..a96c27e0d849a185d65a53ee0f4f622982566182 GIT binary patch literal 1746 zcmV;@1}*uCP)1^@s6CL{cVCfOrDS zK@i_qUvp9tlT>MUXEME5lrZe7XTMO0e;10{k+l2Yp6Q^)b zz5UkgvI9AgiV)?^#Zmc5@gY4tD5yZ1AT$N4`mgsEoTFN|4w>+}c^K34q0{1$Y+{M9-hv!TtGPAVrLYC~y5>dj)?p^(kP87Nl;Scu!i7 zmOGFFMna4=zN=a&*7LT4FvvPA-0MMzFdfodV5 zBcyQpFGwM6P)LDS8By7g5T#W0aK_xlh6+LM5f!XMe46^}ci)_JpE=Bx{igOv1xw!1 zqSO+I(vdDs9(`>Vs$VKZ;36&m7~;`H5K9Ns-|j;K#d*LtZC z5EQ3HBY;|?&ODd9;s)0CMJ zzG7R2C7~L1JrF{1U6Rfp4uduHXwNP*fol~55=o-8!w))q-^<-g3`F2Ab7UpTdk8@B zB{0w%q1G^2Lyv;hWlz;^v1o@~6DWDPN5Nm1a)sO}Fz*dNkfASKC{(P?jIV}M2tpTy zSOJ!>DGZ%LY>Pk_$}ptpG#)P~L>Var&j$;%VMx&- z0P7`DT_xh2;V)fqgAq-clk&=&VAIG<^-JZ3KC7@sy4>9x zE9I3ps08btD3=noX%w_+;d+i?n;t>J8Tq-CsLQ8`8B}%PQ86i+WQ`}hDtB5a8J)K{ zb)TMMSE$f}O&9{m8n~5unifY7qI<3aAxu(UR5U5=tftW_kO*CV;8*H#@Uxu-RMJO& zQdVcOuX2jKtT zmjpDbX_6RXM7;?5tulb3*-~R=!?cZwJcUX5;nI$oz$@ql5e%Vz1cmUZeLwI*i5YLK zRe{=^Ax=LP*4oo^PuZixE|eOpd-_iW;-K9XO7-+$W`P^NpOIpxzfn_Js1VfQW(m2M zq~$MYAgAUs0ZmVemzNz%p$G5YDB1-9x8t7ih=46dWS?akVqEw^>TBp_igbEChn8lR z7z107vk>D77$^p-7yJJp1}kSt9V)&Q)Foro%{pX^YBwJm^B5moDQ#=lisr601LzQ3 zCx(??Y8kPPG7Z60X?nh^_YWUJ%=@??M(i_PM3R2#I8cv`(PO;v{cTBYiaH`pDvGXEIJ9X(6irT#cM>ruosg;!{m@Zp?UHUo5T*xx z3A9>Y8axFLjY=z&!6rePRi{DF~#WQE<_&0 z5#w44L70dUcq6!`^rB(TffsEJyVuqtdJM7*%4E^$qif$Wb7mQU^@~?=mqefi``TMX oKV%&v1wUvi`Rk3l-|w;h1%PHX0iyVU_5c6?07*qoM6N<$f+yS|tpET3 literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable/round_white_50dp.xml b/app/src/main/res/drawable/round_white_50dp.xml new file mode 100644 index 0000000..5f0e354 --- /dev/null +++ b/app/src/main/res/drawable/round_white_50dp.xml @@ -0,0 +1,11 @@ + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_chatting_detail.xml b/app/src/main/res/layout/activity_chatting_detail.xml index fae8513..9cf3197 100644 --- a/app/src/main/res/layout/activity_chatting_detail.xml +++ b/app/src/main/res/layout/activity_chatting_detail.xml @@ -20,7 +20,7 @@ android:id="@+id/chatting_detail_pharmacist_civ" android:layout_width="70dp" android:layout_height="70dp" - android:src="@drawable/ic_launcher_background" + android:src="@drawable/img_women_nostroke" app:layout_constraintTop_toTopOf="parent" app:layout_constraintStart_toStartOf="parent"/> @@ -29,18 +29,23 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginStart="10dp" + android:text="0000약국 약사" - android:textSize="24sp" + android:textSize="60px" android:textStyle="bold" android:textColor="@color/black" + app:layout_constraintTop_toTopOf="@id/chatting_detail_pharmacist_civ" app:layout_constraintBottom_toBottomOf="@id/chatting_detail_pharmacist_civ" app:layout_constraintStart_toEndOf="@id/chatting_detail_pharmacist_civ"/>