From 6baf57922ebf7bb998a2c6f0d2495aebe5e27b51 Mon Sep 17 00:00:00 2001 From: kangmingu Date: Sat, 9 Oct 2021 13:08:29 +0900 Subject: [PATCH 01/16] =?UTF-8?q?gitignore=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .idea/runConfigurations.xml | 10 ---------- app/.gitignore | 1 + 2 files changed, 1 insertion(+), 10 deletions(-) delete mode 100644 .idea/runConfigurations.xml diff --git a/.idea/runConfigurations.xml b/.idea/runConfigurations.xml deleted file mode 100644 index 797acea..0000000 --- a/.idea/runConfigurations.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/app/.gitignore b/app/.gitignore index 93ac2ed..78b4d75 100644 --- a/app/.gitignore +++ b/app/.gitignore @@ -165,6 +165,7 @@ obj/ .idea/dynamic.xml .idea/uiDesigner.xml .idea/jarRepositories.xml +.idea/runConfigurations.xml # OS-specific files .DS_Store From dac2f23cbdf63c42bc91dfcc4d238fee1c2726c2 Mon Sep 17 00:00:00 2001 From: kangmingu Date: Sat, 9 Oct 2021 13:24:49 +0900 Subject: [PATCH 02/16] =?UTF-8?q?=EB=A9=94=EC=9D=B8=ED=99=94=EB=A9=B4=20?= =?UTF-8?q?=EA=B3=A0=EC=96=91=EC=9D=B4=20=EC=9D=B4=EB=A6=84=20=EC=88=98?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 1 + .idea/misc.xml | 2 +- .../res/drawable/ic_arrow_below_fill_orange.xml | 9 +++++++++ app/src/main/res/layout/activity_main.xml | 15 ++++----------- app/src/main/res/values/colors.xml | 2 ++ 5 files changed, 17 insertions(+), 12 deletions(-) create mode 100644 app/src/main/res/drawable/ic_arrow_below_fill_orange.xml diff --git a/.gitignore b/.gitignore index 38518ef..9c278d5 100644 --- a/.gitignore +++ b/.gitignore @@ -148,6 +148,7 @@ obj/ /out/ # User-specific configurations +.idea/*.xml .idea/caches/ .idea/libraries/ .idea/shelf/ diff --git a/.idea/misc.xml b/.idea/misc.xml index e9bab2b..883feab 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -7,7 +7,7 @@ - + diff --git a/app/src/main/res/drawable/ic_arrow_below_fill_orange.xml b/app/src/main/res/drawable/ic_arrow_below_fill_orange.xml new file mode 100644 index 0000000..7fd3822 --- /dev/null +++ b/app/src/main/res/drawable/ic_arrow_below_fill_orange.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index ad99874..afec801 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -56,23 +56,16 @@ android:layout_height="wrap_content" android:fontFamily="@font/notosans_bold" android:textSize="26sp" + android:textColor="@color/main_grey" + android:drawablePadding="8dp" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintHorizontal_bias="0.098" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="@id/toolbar_register" app:layout_constraintVertical_bias="0.1" - tools:text="이겨울" /> - - + tools:text="이겨울" + app:drawableEndCompat="@drawable/ic_arrow_below_fill_orange" /> #19ff8762 #80343434 #00ff0000 + + #343434 \ No newline at end of file From 2b180ebb952e2d799ce42b89fc9003c2d478e862 Mon Sep 17 00:00:00 2001 From: kangmingu Date: Sat, 9 Oct 2021 14:04:09 +0900 Subject: [PATCH 03/16] =?UTF-8?q?=EA=B2=80=EC=83=89=ED=99=94=EB=A9=B4=20ui?= =?UTF-8?q?=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/teamounce/ounce/main/MainActivity.kt | 3 --- .../ounce/review/ui/SearchActivity.kt | 23 +++++++++++++++++++ app/src/main/res/layout/activity_search.xml | 12 ++++++---- app/src/main/res/values/styles.xml | 6 +++++ 4 files changed, 36 insertions(+), 8 deletions(-) diff --git a/app/src/main/java/com/teamounce/ounce/main/MainActivity.kt b/app/src/main/java/com/teamounce/ounce/main/MainActivity.kt index 8923a4d..7295be3 100644 --- a/app/src/main/java/com/teamounce/ounce/main/MainActivity.kt +++ b/app/src/main/java/com/teamounce/ounce/main/MainActivity.kt @@ -65,9 +65,6 @@ class MainActivity : BindingActivity(R.layout.activity_main textviewCatName.setOnClickListener { bottomSheetFragment.show(supportFragmentManager, "bottomsheet") } - imageviewDropbox.setOnClickListener { - bottomSheetFragment.show(supportFragmentManager, "bottomsheet") - } } } diff --git a/app/src/main/java/com/teamounce/ounce/review/ui/SearchActivity.kt b/app/src/main/java/com/teamounce/ounce/review/ui/SearchActivity.kt index db603c9..1725014 100644 --- a/app/src/main/java/com/teamounce/ounce/review/ui/SearchActivity.kt +++ b/app/src/main/java/com/teamounce/ounce/review/ui/SearchActivity.kt @@ -1,9 +1,11 @@ package com.teamounce.ounce.review.ui +import android.content.Context import android.content.Intent import android.os.Bundle import android.view.KeyEvent import android.view.View +import android.view.inputmethod.InputMethodManager import androidx.activity.viewModels import androidx.recyclerview.widget.GridLayoutManager import androidx.recyclerview.widget.LinearLayoutManager @@ -22,6 +24,10 @@ class SearchActivity : BindingActivity(R.layout.activity_ private val searchViewModel: SearchViewModel by viewModels() private lateinit var searchAdapter: SearchAdapter + private val mImm by lazy { + getSystemService(Context.INPUT_METHOD_SERVICE) as InputMethodManager + } + override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) StatusBarUtil.setStatusBar(this) @@ -47,6 +53,8 @@ class SearchActivity : BindingActivity(R.layout.activity_ setObserver() setUIListener() setSearchTypeChangeListener() + + focusSearchEdt() } private fun setObserver() { @@ -79,11 +87,19 @@ class SearchActivity : BindingActivity(R.layout.activity_ binding.etReviewSearch.setOnKeyListener { _, keyCode, keyEvent -> if (keyEvent.action == KeyEvent.ACTION_DOWN && keyCode == KeyEvent.KEYCODE_ENTER) { searchViewModel.search() + mImm.hideSoftInputFromWindow(currentFocus?.windowToken, 0) + binding.etReviewSearch.clearFocus() true } else { false } } + + binding.imgReviewSearch.setOnClickListener { + searchViewModel.search() + mImm.hideSoftInputFromWindow(currentFocus?.windowToken, 0) + binding.etReviewSearch.clearFocus() + } } private fun setSearchTypeChangeListener() { @@ -98,4 +114,11 @@ class SearchActivity : BindingActivity(R.layout.activity_ } } + private fun focusSearchEdt() { + binding.etReviewSearch.requestFocus() + + mImm.toggleSoftInput(InputMethodManager.SHOW_FORCED, InputMethodManager.HIDE_IMPLICIT_ONLY) + + } + } \ No newline at end of file diff --git a/app/src/main/res/layout/activity_search.xml b/app/src/main/res/layout/activity_search.xml index 3c20ffd..c72dcb5 100644 --- a/app/src/main/res/layout/activity_search.xml +++ b/app/src/main/res/layout/activity_search.xml @@ -33,13 +33,13 @@ android:id="@+id/img_review_back" android:layout_width="wrap_content" android:layout_height="?attr/actionBarSize" - android:layout_marginStart="12dp" + android:layout_marginStart="16dp" android:paddingEnd="32dp" android:src="@drawable/ic_back" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" - app:tint="@color/orangey_red" /> + app:tint="@color/gray1" /> + app:layout_constraintTop_toBottomOf="@+id/toolbar_review_search"> + + + @drawable/splash fitXY + + \ No newline at end of file From 71fc8de72c11070db584b4cfcdf9dcd6c311340f Mon Sep 17 00:00:00 2001 From: kangmingu Date: Sat, 9 Oct 2021 14:25:15 +0900 Subject: [PATCH 04/16] =?UTF-8?q?=EC=82=AC=EB=A3=8C=20=EA=B2=80=EC=83=89?= =?UTF-8?q?=20=EC=95=84=EC=9D=B4=ED=85=9C=20ui=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .idea/misc.xml | 3 +++ app/src/main/res/layout/activity_search.xml | 3 +-- app/src/main/res/layout/item_food_search_grid.xml | 13 +++++++------ 3 files changed, 11 insertions(+), 8 deletions(-) diff --git a/.idea/misc.xml b/.idea/misc.xml index 883feab..b8084ae 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -3,12 +3,14 @@ diff --git a/app/src/main/res/layout/activity_search.xml b/app/src/main/res/layout/activity_search.xml index c72dcb5..acc874a 100644 --- a/app/src/main/res/layout/activity_search.xml +++ b/app/src/main/res/layout/activity_search.xml @@ -39,7 +39,7 @@ app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" - app:tint="@color/gray1" /> + app:tint="@color/gray1.5" /> diff --git a/app/src/main/res/layout/item_food_search_grid.xml b/app/src/main/res/layout/item_food_search_grid.xml index a9ccdce..97c8435 100644 --- a/app/src/main/res/layout/item_food_search_grid.xml +++ b/app/src/main/res/layout/item_food_search_grid.xml @@ -11,17 +11,17 @@ @@ -36,10 +36,11 @@ android:text="@{catFood.manufacturer}" android:textColor="@color/text_color_gray" android:textFontWeight="500" + android:lineSpacingExtra="-2sp" android:textSize="12sp" app:layout_constraintStart_toStartOf="@+id/img_item_search" app:layout_constraintTop_toBottomOf="@+id/img_item_search" - tools:text="브랜드 이름" /> + tools:text="브랜드 이름\n브랜드 이름" /> Date: Sat, 9 Oct 2021 14:39:51 +0900 Subject: [PATCH 05/16] =?UTF-8?q?=EB=A6=AC=EB=B7=B0=20=EC=9E=91=EC=84=B1?= =?UTF-8?q?=20=ED=99=94=EB=A9=B4=20ui=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .idea/misc.xml | 2 ++ .../ounce/review/ui/SearchActivity.kt | 6 ++++-- app/src/main/res/drawable/ic_foot_empty.xml | 10 +++++----- app/src/main/res/layout/activity_review.xml | 19 ++++++++++--------- app/src/main/res/layout/activity_search.xml | 2 +- 5 files changed, 22 insertions(+), 17 deletions(-) diff --git a/.idea/misc.xml b/.idea/misc.xml index b8084ae..c7fae4c 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -4,11 +4,13 @@ diff --git a/app/src/main/res/layout/activity_search.xml b/app/src/main/res/layout/activity_search.xml index d7b1146..a8e4e41 100644 --- a/app/src/main/res/layout/activity_search.xml +++ b/app/src/main/res/layout/activity_search.xml @@ -175,54 +175,52 @@ android:id="@+id/clayout_no_result" android:layout_width="match_parent" android:layout_height="0dp" + android:background="@color/white" android:visibility="gone" app:layout_constraintBottom_toBottomOf="parent" - app:layout_constraintTop_toBottomOf="@+id/et_review_search" - tools:visibility="gone"> + app:layout_constraintTop_toBottomOf="@+id/et_review_search"> - - + + - - - - + android:foreground="?attr/selectableItemBackground" + app:cardBackgroundColor="@color/gray_three" + app:cardCornerRadius="36dp" + app:cardElevation="0dp" + android:layout_marginTop="10dp" + android:layout_marginBottom="52dp" + app:layout_constraintVertical_bias="0.5" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintBottom_toTopOf="@id/img_no_result" + app:layout_constraintTop_toBottomOf="@id/txt_search_empty_explain"> - + + app:layout_constraintTop_toBottomOf="@+id/btn_suggest_cat_food" /> diff --git a/app/src/main/res/layout/bottom_sheet_review_count_explain.xml b/app/src/main/res/layout/bottom_sheet_review_count_explain.xml new file mode 100644 index 0000000..eeee462 --- /dev/null +++ b/app/src/main/res/layout/bottom_sheet_review_count_explain.xml @@ -0,0 +1,63 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index 3159549..ecab4c0 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -50,4 +50,15 @@ #00ff0000 #343434 + + #EEEEEE + #FFEAD9 + #F87F6E + #FFE6DC + #3187BA + #DFE8F1 + #7E9194 + #E3E3E5 + #82A69A + #D8E1E0 \ No newline at end of file diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml index ab1db3e..7e33ab1 100644 --- a/app/src/main/res/values/themes.xml +++ b/app/src/main/res/values/themes.xml @@ -12,6 +12,7 @@ ?attr/colorPrimaryVariant + @style/BaseBottomSheetDialog