Merge branch 'develop' into hotfix/#175-second-qa

Team-Going · Jan 19, 2024 · 184de7e · 184de7e
2 parents 155b056 + a34f68b
commit 184de7e
Show file tree

Hide file tree

Showing 5 changed files with 43 additions and 15 deletions.
diff --git a/README.md b/README.md
@@ -1,16 +1,17 @@
-<img src="https://github.com/Team-Going/Going-Android/assets/97405341/9d8f8e2b-f3f6-4773-813b-49d3a9a86432" width=220 />
-
+<img src="https://github.com/Team-Going/Going-Android/assets/97405341/9d8f8e2b-f3f6-4773-813b-49d3a9a86432" width=120 />
 
 # doorip
+<p align="center"><img src="https://github.com/Team-Going/Going-Android/assets/97405341/a49585b0-e4d3-4713-b5de-0e61aede220d"></p>
+
 **서로를 이해하며 완성해가는 우리의 여행 To-do, Doorip**
 
 *여행자 10명 중 6명은 여행을 같이 간 사람과 갈등을 겪고*, 다음 여행에서는 누군가와 함께 하는 여행 자체를 망설이게 됩니다.
 </br>
 고잉고잉은 이 문제를 해결할, 쉽고 재밌는 솔루션을 만드는 팀입니다. 
 
-Doorip에서 **여행에서 공동 할일 관리에 대한 불편과 부담을 내려놓고 좋아하는 사람들과 여행을 오롯이 즐기세요.**
+doorip에서 **여행에서 공동 할일 관리에 대한 불편과 부담을 내려놓고 좋아하는 사람들과 여행을 오롯이 즐기세요.**
 
-여행 중에 생기는 모든 할 일을 함께 관리하세요. 두립의 여행 취향 테스트와 프로필 기능으로 서로를 이해할 수 있어요.
+여행 중에 생기는 모든 할 일을 함께 관리하세요. doorip의 취향태그와 유형테스트로 서로를 이해할 수 있어요.
 
 <img height="20px" src="https://img.shields.io/badge/Android-3DDC84?style=flat-square&logo=android&logoColor=white"/> <img height="20px" src="https://img.shields.io/badge/Kotlin-7F52FF?style=for-the-badge&logo=Kotlin&logoColor=white">
 
@@ -20,7 +21,7 @@ Doorip에서 **여행에서 공동 할일 관리에 대한 불편과 부담을
 | 김상호<br/>([@Marchbreeze](https://github.com/Marchbreeze)) | 박동민<br/>([@chattymin](https://github.com/chattymin)) | 이유빈<br/>([@leeeyubin](https://github.com/leeeyubin)) | 조세연<br/>([@crownjoe](https://github.com/crownjoe)) |
 |:---------------------------------------------------------------------------------------------------------------------------:|:---------------------------------------------------------------------------------------------------------------------------:|:---------------------------------------------------------------------------------------------------------------------------:|:---------------------------------------------------------------------------------------------------------------------------:|
 | <img width="200px" src="https://github.com/Team-Going/Going-Android/assets/97405341/68834cbc-67c6-4f21-a010-63c7e440410e"/> | <img width="200px" src="https://github.com/Team-Going/Going-Android/assets/97405341/04c3f595-d8cf-4d4a-a6c6-bd2e6d4c9a43"/> | <img width="200px" src="https://github.com/Team-Going/Going-Android/assets/97405341/1c0f5866-8a39-445d-9664-3d3fc76bb39d"/> | <img width="200px" src="https://github.com/Team-Going/Going-Android/assets/97405341/1269e602-32db-4cb6-a91a-8b80c8a9730e"/> |
-| `마이 투두`<br/>`아워 투두`  | `온보딩`<br/>`여행 성향` | `취향 태그`<br/>`대시보드` | `여행 생성` <br/>`여행 입장` |
+| `공동 투두`<br/>`개인 투두`<br/>`할일 추가/조회`  | `스플래쉬`<br/>`온보딩`<br/>`여행 성향` | `대시보드`<br/>`취향 태그`<br/>`공동 취향` | `여행 생성`<br/>`여행 입장`<br/>`프로필` |
 
 
 
@@ -66,11 +67,24 @@ Doorip에서 **여행에서 공동 할일 관리에 대한 불편과 부담을
 - Android App Architecture
 - Hilt
 - Coroutine & Flow
-- Timber
-- Coil
+- Data Binding
+- Timber, Coil, Lottie
+- Kakao Open API
 <br>
 
 
+## SCREENSHOTS
+| 뷰 | 1 | 2 | 3 | 4 |
+|:-------------:|:---------------------------------------------------------------------------------------------------------------------------:|:---------------------------------------------------------------------------------------------------------------------------:|:---------------------------------------------------------------------------------------------------------------------------:|:---------------------------------------------------------------------------------------------------------------------------:|
+| 온보딩 <br> 성향검사 | <img width="150px" src="https://github.com/Team-Going/Going-Android/assets/97405341/f79733e0-d4ff-4755-adcc-b334e90a5c62"/> | <img width="150px" src="https://github.com/Team-Going/Going-Android/assets/97405341/dec2b462-6618-4917-8d03-e7d8542dffb3"/> | <img width="150px" src="https://github.com/Team-Going/Going-Android/assets/97405341/f5b18987-6953-4b14-8ebd-296bb5d5f82b"/> | <img width="150px" src="https://github.com/Team-Going/Going-Android/assets/97405341/d84e184e-5397-4825-9485-1b9766830cc9"/> | | |
+| 여행생성 <br> 여행입장 <br> 대시보드 | <img width="150px" src="https://github.com/Team-Going/Going-Android/assets/97405341/e62ea373-914f-4c35-94ff-6eb9ed79580e"/> | <img width="150px" src="https://github.com/Team-Going/Going-Android/assets/97405341/692a00d3-2f4e-43fb-b707-480c36d08b54"/> | <img width="150px" src="https://github.com/Team-Going/Going-Android/assets/97405341/1d684b23-7712-44c0-ae38-8f0f258fa880"/> | <img width="150px" src="https://github.com/Team-Going/Going-Android/assets/97405341/1c596bf7-9cc6-455b-b5c7-90fdf82dbe33"/> |
+| 아워투두 <br> 개인투두 | <img width="150px" src="https://github.com/Team-Going/Going-Android/assets/97405341/7d5e0481-6527-4ce4-b12f-f6a4237f12bf"/> | <img width="150px" src="https://github.com/Team-Going/Going-Android/assets/97405341/e5a8d79c-b014-4750-957f-0ccafd35d763"/> | <img width="150px" src="https://github.com/Team-Going/Going-Android/assets/97405341/89c270e6-f17a-4f14-99e2-b41f230a4477"/> | <img width="150px" src="https://github.com/Team-Going/Going-Android/assets/97405341/7146f1f5-cbd7-46db-b4ed-066ed451f7de"/> |
+| 프로필 <br> 설정 | <img width="150px" src="https://github.com/Team-Going/Going-Android/assets/97405341/c34fb56c-a54c-47b2-9c0a-d18be63ae1de"/> | <img width="150px" src="https://github.com/Team-Going/Going-Android/assets/97405341/96234e32-2980-488f-bb9f-3b92afa504fa"/> | 
+
+<br>
+
+
+
 ## KANBAN BOARD
 - [GOINGGOING PROJECT](https://github.com/orgs/Team-Going/projects/2)
 <br> 

diff --git a/buildSrc/src/main/kotlin/Constants.kt b/buildSrc/src/main/kotlin/Constants.kt
@@ -3,6 +3,6 @@ object Constants {
  const val compileSdk = 34
  const val minSdk = 28
  const val targetSdk = 34
- const val versionCode = 10
+ const val versionCode = 11
  const val versionName = "1.0"
 }
diff --git a/core-ui/src/main/java/com/going/ui/base/BaseActivity.kt b/core-ui/src/main/java/com/going/ui/base/BaseActivity.kt
@@ -1,5 +1,6 @@
 package com.going.ui.base
 
+import android.graphics.Rect
 import android.os.Bundle
 import android.view.MotionEvent
 import android.view.View
@@ -22,7 +23,18 @@ abstract class BaseActivity<T : ViewDataBinding>(
  }
 
  override fun dispatchTouchEvent(ev: MotionEvent?): Boolean {
- hideKeyboard(currentFocus ?: View(this))
+ if (ev?.action == MotionEvent.ACTION_UP){
+ val currentFocus = currentFocus
+ if (currentFocus != null && isTouchOutsideView(currentFocus, ev)){
+ hideKeyboard(currentFocus)
+ currentFocus.clearFocus()
+ }
+ }
  return super.dispatchTouchEvent(ev)
  }
+
+ private fun isTouchOutsideView(view: View, ev: MotionEvent): Boolean {
+ val outRect = Rect(view.left, view.top, view.right, view.bottom)
+ return !outRect.contains(ev.rawX.toInt(), ev.rawY.toInt())
+ }
 }
diff --git a/presentation/src/main/res/layout/activity_private_detail.xml b/presentation/src/main/res/layout/activity_private_detail.xml
@@ -199,15 +199,15 @@
  </androidx.constraintlayout.widget.ConstraintLayout>
 
  <TextView
+ style="@style/TextAppearance.Doorip.Detail2.Regular"
  android:layout_width="wrap_content"
  android:layout_height="wrap_content"
- app:layout_constraintStart_toEndOf="@id/layout_my_todo_detail_person_lock"
- android:text="@string/my_todo_create_tv_person_lock_description"
  android:layout_marginStart="8dp"
- style="@style/TextAppearance.Doorip.Detail2.Regular"
+ android:text="@string/my_todo_create_tv_person_lock_description"
  android:textColor="@color/gray_200"
- app:layout_constraintTop_toTopOf="@id/layout_my_todo_detail_person_lock"
- app:layout_constraintBottom_toBottomOf="@id/layout_my_todo_detail_person_lock"/>
+ app:layout_constraintBottom_toBottomOf="@id/layout_my_todo_detail_person_lock"
+ app:layout_constraintStart_toEndOf="@id/layout_my_todo_detail_person_lock"
+ app:layout_constraintTop_toTopOf="@id/layout_my_todo_detail_person_lock" />
 
 
  <TextView
@@ -229,6 +229,7 @@
  android:layout_height="wrap_content"
  android:layout_marginHorizontal="24dp"
  android:layout_marginTop="6dp"
+ android:autoLink="web"
  android:background="@drawable/shape_rect_4_gray700_line"
  android:gravity="top"
  android:minLines="6"

diff --git a/presentation/src/main/res/layout/activity_public_detail.xml b/presentation/src/main/res/layout/activity_public_detail.xml
@@ -176,7 +176,7 @@
  app:layout_constraintEnd_toEndOf="parent"
  app:layout_constraintStart_toStartOf="parent"
  app:layout_constraintTop_toBottomOf="@id/tv_our_todo_detail_person_title"
- tools:listitem="@layout/item_todo_create_name"/>
+ tools:listitem="@layout/item_todo_create_name" />
 
  <TextView
  android:id="@+id/tv_our_todo_create_memo_title"
@@ -197,6 +197,7 @@
  android:layout_height="wrap_content"
  android:layout_marginHorizontal="24dp"
  android:layout_marginTop="6dp"
+ android:autoLink="web"
  android:background="@drawable/shape_rect_4_gray700_line"
  android:gravity="top"
  android:minLines="6"