From e83f68a30362d22122938cee84af7cf6101186f1 Mon Sep 17 00:00:00 2001 From: Haeeul <39720852+Haeeul@users.noreply.github.com> Date: Fri, 26 Jan 2024 13:03:33 +0900 Subject: [PATCH 01/11] Create version tag MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit release/tag 자동화 처리 --- .github/workflows/version tag | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 .github/workflows/version tag diff --git a/.github/workflows/version tag b/.github/workflows/version tag new file mode 100644 index 00000000..685c7a69 --- /dev/null +++ b/.github/workflows/version tag @@ -0,0 +1,20 @@ +name: Release Tag +on: + push: + branches: + - master +jobs: + build: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + - name: 버전 정보 추출 + run: echo "##[set-output name=version;]$(echo '${{ github.event.head_commit.message }}' | egrep -o '[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}')" + id: extract_version_name + - name: Release 생성 + uses: actions/create-release@v1 + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + with: + tag_name: ${{ steps.extract_version_name.outputs.version }} + release_name: ${{ steps.extract_version_name.outputs.version }} From 4b6e594473747c27e351802c07bd872f68c36806 Mon Sep 17 00:00:00 2001 From: Haeeul <39720852+Haeeul@users.noreply.github.com> Date: Fri, 26 Jan 2024 15:15:20 +0900 Subject: [PATCH 02/11] Delete .github/workflows/version tag --- .github/workflows/version tag | 20 -------------------- 1 file changed, 20 deletions(-) delete mode 100644 .github/workflows/version tag diff --git a/.github/workflows/version tag b/.github/workflows/version tag deleted file mode 100644 index 685c7a69..00000000 --- a/.github/workflows/version tag +++ /dev/null @@ -1,20 +0,0 @@ -name: Release Tag -on: - push: - branches: - - master -jobs: - build: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v2 - - name: 버전 정보 추출 - run: echo "##[set-output name=version;]$(echo '${{ github.event.head_commit.message }}' | egrep -o '[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}')" - id: extract_version_name - - name: Release 생성 - uses: actions/create-release@v1 - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - with: - tag_name: ${{ steps.extract_version_name.outputs.version }} - release_name: ${{ steps.extract_version_name.outputs.version }} From aec01c329765b74e2a0a50e2170f678ae0fa1c54 Mon Sep 17 00:00:00 2001 From: Haeeul <39720852+Haeeul@users.noreply.github.com> Date: Fri, 26 Jan 2024 15:52:05 +0900 Subject: [PATCH 03/11] Create release_tag.yml --- .github/workflows/release_tag.yml | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 .github/workflows/release_tag.yml diff --git a/.github/workflows/release_tag.yml b/.github/workflows/release_tag.yml new file mode 100644 index 00000000..685c7a69 --- /dev/null +++ b/.github/workflows/release_tag.yml @@ -0,0 +1,20 @@ +name: Release Tag +on: + push: + branches: + - master +jobs: + build: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + - name: 버전 정보 추출 + run: echo "##[set-output name=version;]$(echo '${{ github.event.head_commit.message }}' | egrep -o '[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}')" + id: extract_version_name + - name: Release 생성 + uses: actions/create-release@v1 + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + with: + tag_name: ${{ steps.extract_version_name.outputs.version }} + release_name: ${{ steps.extract_version_name.outputs.version }} From cd140c8ccca1af5d6e71c6f03dc8f96b9ec608d2 Mon Sep 17 00:00:00 2001 From: Haeeul Date: Mon, 29 Jan 2024 23:04:11 +0900 Subject: [PATCH 04/11] =?UTF-8?q?[fix]=20#287=20=ED=95=84=ED=84=B0=20?= =?UTF-8?q?=EB=B8=8C=EB=9E=9C=EB=93=9C=20=ED=83=AD=20=EC=9A=B0=EC=B8=A1?= =?UTF-8?q?=EC=97=90=20=EA=B5=AC=EB=B6=84=EC=84=A0=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/main/res/layout/fragment_filter.xml | 2 +- app/src/main/res/layout/fragment_filter_brand.xml | 15 +++++++++++++-- app/src/main/res/values/colors.xml | 1 + 3 files changed, 15 insertions(+), 3 deletions(-) diff --git a/app/src/main/res/layout/fragment_filter.xml b/app/src/main/res/layout/fragment_filter.xml index ef9f3f34..8420e143 100644 --- a/app/src/main/res/layout/fragment_filter.xml +++ b/app/src/main/res/layout/fragment_filter.xml @@ -56,7 +56,7 @@ app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" - app:srcCompat="@color/gray_cd" /> + app:srcCompat="@color/light_gray_ec" /> + tools:listitem="@layout/rv_item_filter_brand_tab"> + + + #f0f0f0 #f9f9f9 #dbdbdb + #ececec #cdcdcd #b6b6b6 From e3481bb0ea4ad57d1a3397f6188158b77d946c49 Mon Sep 17 00:00:00 2001 From: Haeeul Date: Thu, 1 Feb 2024 15:55:46 +0900 Subject: [PATCH 05/11] =?UTF-8?q?[style]=20#296=20=ED=95=84=ED=84=B0=20?= =?UTF-8?q?=EC=83=81=EB=8B=A8=20=ED=83=AD=20=EC=84=A0=ED=83=9D=20=ED=95=AD?= =?UTF-8?q?=EB=AA=A9=20=EA=B0=9C=EC=88=98=20=ED=91=9C=EC=8B=9C=20=EB=B0=A9?= =?UTF-8?q?=EC=8B=9D=20=EC=88=98=EC=A0=95(=EB=B0=B0=EC=A7=80=20->=20?= =?UTF-8?q?=ED=85=8D=EC=8A=A4=ED=8A=B8)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../android/ui/filter/FilterFragment.kt | 23 +++++++++++++------ 1 file changed, 16 insertions(+), 7 deletions(-) diff --git a/app/src/main/java/com/scentsnote/android/ui/filter/FilterFragment.kt b/app/src/main/java/com/scentsnote/android/ui/filter/FilterFragment.kt index 8dd28458..db0de1d4 100644 --- a/app/src/main/java/com/scentsnote/android/ui/filter/FilterFragment.kt +++ b/app/src/main/java/com/scentsnote/android/ui/filter/FilterFragment.kt @@ -76,6 +76,7 @@ class FilterFragment : Fragment() { override fun onResume() { super.onResume() + binding.tabFilter.changeTabsFont(0) firebaseAnalytics.setPageViewEvent("Filter", this::class.java.name) } @@ -156,7 +157,6 @@ class FilterFragment : Fragment() { filterCategoryList.forEachIndexed { index, filterCategory -> val tab = getTabAt(index) tab?.text = filterCategory.nameText - tab?.orCreateBadge?.backgroundColor = context.getColor(R.color.black) } addOnTabSelectedListener(TabSelectedListener(binding.tabFilter)) changeTabsFont(0) @@ -166,26 +166,35 @@ class FilterFragment : Fragment() { private fun observeViewModel() { seriesViewModel.selectedCount.observe(viewLifecycleOwner) { count -> val tab = binding.tabFilter.getTabAt(FilterCategory.Series.index) - tab?.orCreateBadge?.let { - updateCategoryBadge(it, count) + if(count != 0){ + tab?.text = FilterCategory.Series.nameText+"($count)" + }else{ + tab?.text = FilterCategory.Series.nameText } updateApplyBtnText() + binding.tabFilter.changeTabsFont(FilterCategory.Series.index) } brandViewModel.selectedCount.observe(viewLifecycleOwner) { count -> val tab = binding.tabFilter.getTabAt(FilterCategory.Brand.index) - tab?.orCreateBadge?.let { - updateCategoryBadge(it, count) + if(count != 0){ + tab?.text = FilterCategory.Brand.nameText+"($count)" + }else{ + tab?.text = FilterCategory.Brand.nameText } updateApplyBtnText() + binding.tabFilter.changeTabsFont(FilterCategory.Brand.index) } keywordViewModel.selectedCount.observe(viewLifecycleOwner) { count -> val tab = binding.tabFilter.getTabAt(FilterCategory.Keyword.index) - tab?.orCreateBadge?.let { - updateCategoryBadge(it, count) + if(count != 0){ + tab?.text = FilterCategory.Keyword.nameText+"($count)" + }else{ + tab?.text = FilterCategory.Keyword.nameText } updateApplyBtnText() + binding.tabFilter.changeTabsFont(FilterCategory.Keyword.index) } } From 2c144e796b3dd619d42fd86e47487c7b3f0eecae Mon Sep 17 00:00:00 2001 From: Haeeul Date: Thu, 1 Feb 2024 16:22:37 +0900 Subject: [PATCH 06/11] =?UTF-8?q?[style]=20#296=20=EB=B8=8C=EB=9E=9C?= =?UTF-8?q?=EB=93=9C=20=ED=83=AD=20=EB=82=B4=20=ED=95=AD=EB=AA=A9=EC=97=90?= =?UTF-8?q?=20=EC=9E=88=EB=8A=94=20=ED=95=98=EB=8B=A8=20=EA=B5=AC=EB=B6=84?= =?UTF-8?q?=EC=84=A0=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/main/res/layout/rv_item_filter_brand.xml | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/app/src/main/res/layout/rv_item_filter_brand.xml b/app/src/main/res/layout/rv_item_filter_brand.xml index 9a60d6fb..66e3f198 100644 --- a/app/src/main/res/layout/rv_item_filter_brand.xml +++ b/app/src/main/res/layout/rv_item_filter_brand.xml @@ -18,15 +18,15 @@ android:layout_height="wrap_content" android:layout_marginStart="18dp" android:layout_marginTop="15dp" - android:layout_marginEnd="19dp" + android:layout_marginEnd="32dp" android:layout_marginBottom="15dp" android:checkMark="@drawable/selector_icon_check" + android:checked="@{item.check}" android:fontFamily="@font/notosans_regular" - android:textSize="15dp" android:includeFontPadding="false" - android:textColor="@color/black_text" android:text="@{item.name}" - android:checked="@{item.check}" + android:textColor="@color/black_text" + android:textSize="15dp" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" @@ -35,10 +35,11 @@ + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" /> \ No newline at end of file From 162d18a5c2cdf90806a6dddd62267d6657b27dce Mon Sep 17 00:00:00 2001 From: Haeeul Date: Thu, 1 Feb 2024 17:30:00 +0900 Subject: [PATCH 07/11] =?UTF-8?q?[fix]=20#290=20=ED=95=84=ED=84=B0=20?= =?UTF-8?q?=ED=83=AD=20=EB=82=B4=EC=97=90=EC=84=9C=20=ED=95=AD=EB=AA=A9?= =?UTF-8?q?=EC=9D=84=20=EC=84=A0=ED=83=9D=ED=95=98=EC=A7=80=20=EC=95=8A?= =?UTF-8?q?=EC=9D=80=20=EA=B2=BD=EC=9A=B0=20GA=20=EC=B8=A1=EC=A0=95?= =?UTF-8?q?=EB=90=98=EC=A7=80=20=EC=95=8A=EB=8F=84=EB=A1=9D=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 --- .../android/ui/filter/FilterFragment.kt | 25 +++++++++++++------ 1 file changed, 18 insertions(+), 7 deletions(-) diff --git a/app/src/main/java/com/scentsnote/android/ui/filter/FilterFragment.kt b/app/src/main/java/com/scentsnote/android/ui/filter/FilterFragment.kt index db0de1d4..251cec20 100644 --- a/app/src/main/java/com/scentsnote/android/ui/filter/FilterFragment.kt +++ b/app/src/main/java/com/scentsnote/android/ui/filter/FilterFragment.kt @@ -97,13 +97,7 @@ class FilterFragment : Fragment() { firebaseAnalytics.setClickEvent("FilterActionButton") - reqFilterGa("apply_filter", seriesViewModel.getSelectedSeries()) - reqFilterGa("apply_brand", brandViewModel.getSelectedBrands()) - reqFilterGa("apply_bonding", keywordViewModel.getSelectedKeywords()) - - Log.d("GA 필터 - 계열", seriesViewModel.getSelectedSeries().map { it.name }.toString()) - Log.d("GA 필터 - 브랜드", brandViewModel.getSelectedBrands().map { it.name }.toString()) - Log.d("GA 필터 - 키워드", keywordViewModel.getSelectedKeywords().map { it.name }.toString()) + setFilterGa() } binding.toolbarFilter.toolbarBtn.setOnSafeClickListener { closeSelfWithAnimation() @@ -126,6 +120,23 @@ class FilterFragment : Fragment() { } } + private fun setFilterGa(){ + if(seriesViewModel.getSelectedSeries().isNotEmpty()){ + reqFilterGa("apply_filter", seriesViewModel.getSelectedSeries()) + Log.d("GA 필터 - 계열", seriesViewModel.getSelectedSeries().map { it.name }.toString()) + } + + if(brandViewModel.getSelectedBrands().isNotEmpty()){ + reqFilterGa("apply_brand", brandViewModel.getSelectedBrands()) + Log.d("GA 필터 - 브랜드", brandViewModel.getSelectedBrands().map { it.name }.toString()) + } + + if(keywordViewModel.getSelectedKeywords().isNotEmpty()){ + reqFilterGa("apply_bonding", keywordViewModel.getSelectedKeywords()) + Log.d("GA 필터 - 키워드", keywordViewModel.getSelectedKeywords().map { it.name }.toString()) + } + } + private fun reqFilterGa(type: String, list : List){ list.forEach { firebaseAnalytics.setOneParamClickEvent("kind_of_filter", type, it.name) From f42895c58e562a13336bc7e587027a61e4cf9276 Mon Sep 17 00:00:00 2001 From: Haeeul Date: Mon, 5 Feb 2024 17:56:49 +0900 Subject: [PATCH 08/11] =?UTF-8?q?[fix]=20#251=20=EC=B5=9C=EA=B7=BC=20?= =?UTF-8?q?=EB=B3=B8=20=ED=96=A5=EC=88=98=20=ED=91=9C=EC=8B=9C=20=EC=95=88?= =?UTF-8?q?=EB=90=98=EB=8A=94=20=EB=B2=84=EA=B7=B8=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/scentsnote/android/ui/home/HomeFragment.kt | 14 ++++++++++---- .../android/viewmodel/home/HomeViewModel.kt | 11 +---------- app/src/main/res/layout/fragment_home.xml | 1 - 3 files changed, 11 insertions(+), 15 deletions(-) diff --git a/app/src/main/java/com/scentsnote/android/ui/home/HomeFragment.kt b/app/src/main/java/com/scentsnote/android/ui/home/HomeFragment.kt index 36a3f752..a35a9df2 100644 --- a/app/src/main/java/com/scentsnote/android/ui/home/HomeFragment.kt +++ b/app/src/main/java/com/scentsnote/android/ui/home/HomeFragment.kt @@ -60,7 +60,7 @@ class HomeFragment : Fragment() { override fun onActivityCreated(savedInstanceState: Bundle?) { super.onActivityCreated(savedInstanceState) - observe() + initObserve() initRecommendList() initPopularList() @@ -135,8 +135,8 @@ class HomeFragment : Fragment() { binding.vpHomeRecommend.adapter = recommendAdapter } - private fun observe() { - homeViewModel.recommendPerfumeList.observe(requireActivity(), androidx.lifecycle.Observer { + private fun initObserve() { + homeViewModel.recommendPerfumeList.observe(requireActivity()){ recommendAdapter.run { replaceAll(ArrayList(it)) @@ -144,7 +144,13 @@ class HomeFragment : Fragment() { } binding.indicatorHome.setViewPager(binding.vpHomeRecommend) - }) + } + + homeViewModel.recentPerfumeList.observe(requireActivity()) { + binding.clHomeRecent.visibility = + if(it.isNotEmpty()) View.VISIBLE + else View.GONE + } } private fun initPopularList() { diff --git a/app/src/main/java/com/scentsnote/android/viewmodel/home/HomeViewModel.kt b/app/src/main/java/com/scentsnote/android/viewmodel/home/HomeViewModel.kt index b3895147..0a35691a 100644 --- a/app/src/main/java/com/scentsnote/android/viewmodel/home/HomeViewModel.kt +++ b/app/src/main/java/com/scentsnote/android/viewmodel/home/HomeViewModel.kt @@ -32,10 +32,6 @@ class HomeViewModel : ViewModel(){ val recentPerfumeList : LiveData> get() = _recentPerfumeList - private val _isValidRecentList = MutableLiveData(true) - val isValidRecentList : LiveData - get() = _isValidRecentList - private val _newPerfumeList : MutableLiveData> = MutableLiveData() val newPerfumeList : LiveData> get() = _newPerfumeList @@ -73,15 +69,10 @@ class HomeViewModel : ViewModel(){ private suspend fun getRecentPerfumeList(){ try{ - _isValidRecentList.postValue(true) _recentPerfumeList.value = homeRepository.getRecentPerfumeList(ScentsNoteApplication.prefManager.accessToken) Log.d("getRecentPerfumeList", _recentPerfumeList.value.toString()) - - if(_recentPerfumeList.value!!.isEmpty()){ - _isValidRecentList.postValue(false) - } }catch (e : HttpException){ - _isValidRecentList.postValue(false) + _recentPerfumeList.value = mutableListOf() Log.d("getRecentPerfumeList error", e.message()) } } diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml index b516464c..e588dc99 100644 --- a/app/src/main/res/layout/fragment_home.xml +++ b/app/src/main/res/layout/fragment_home.xml @@ -172,7 +172,6 @@ android:layout_width="0dp" android:layout_height="wrap_content" android:layout_marginTop="42dp" - android:visibility="@{viewModel.isValidRecentList? View.VISIBLE : View.GONE}" android:background="@color/light_gray_f9" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" From aebdb1eaa6041fac357170148aa6de374ef8d4fa Mon Sep 17 00:00:00 2001 From: Haeeul Date: Tue, 6 Feb 2024 15:17:01 +0900 Subject: [PATCH 09/11] =?UTF-8?q?[style]=20#251=20=EC=B5=9C=EA=B7=BC=20?= =?UTF-8?q?=EB=B3=B8=20=ED=96=A5=EC=88=98=20=EC=98=81=EC=97=AD=20=EB=82=B4?= =?UTF-8?q?=20=ED=96=A5=EC=88=98=20=EC=9D=B4=EB=AF=B8=EC=A7=80=20=ED=81=AC?= =?UTF-8?q?=EA=B8=B0=20=EC=A1=B0=EC=A0=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../drawable/background_white_circle_fill.xml | 5 ++++ .../main/res/layout/rv_item_home_recent.xml | 23 ++++++++++++++----- 2 files changed, 22 insertions(+), 6 deletions(-) create mode 100644 app/src/main/res/drawable/background_white_circle_fill.xml diff --git a/app/src/main/res/drawable/background_white_circle_fill.xml b/app/src/main/res/drawable/background_white_circle_fill.xml new file mode 100644 index 00000000..ce2058fb --- /dev/null +++ b/app/src/main/res/drawable/background_white_circle_fill.xml @@ -0,0 +1,5 @@ + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/rv_item_home_recent.xml b/app/src/main/res/layout/rv_item_home_recent.xml index 41c55119..c93b7000 100644 --- a/app/src/main/res/layout/rv_item_home_recent.xml +++ b/app/src/main/res/layout/rv_item_home_recent.xml @@ -14,21 +14,32 @@ android:layout_width="wrap_content" android:layout_height="wrap_content"> - + + Date: Thu, 8 Feb 2024 15:59:25 +0900 Subject: [PATCH 10/11] =?UTF-8?q?[refactor]=20#251=20=ED=99=88=EC=97=90?= =?UTF-8?q?=EC=84=9C=20=EC=82=AC=EC=9A=A9=ED=95=98=EB=8A=94=20coroutine=20?= =?UTF-8?q?=EB=A1=9C=EC=A7=81=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../android/data/remote/RemoteDataSource.kt | 2 +- .../android/data/remote/RemoteDataSourceImpl.kt | 4 ++-- .../android/data/remote/network/ScentsNoteService.kt | 2 +- .../android/data/repository/HomeRepository.kt | 2 +- .../com/scentsnote/android/ui/home/HomeFragment.kt | 10 ++++++++-- .../android/ui/home/MoreNewPerfumeActivity.kt | 8 ++++++++ .../android/viewmodel/home/HomeViewModel.kt | 11 ++--------- 7 files changed, 23 insertions(+), 16 deletions(-) diff --git a/app/src/main/java/com/scentsnote/android/data/remote/RemoteDataSource.kt b/app/src/main/java/com/scentsnote/android/data/remote/RemoteDataSource.kt index 735a5fe0..9e081189 100644 --- a/app/src/main/java/com/scentsnote/android/data/remote/RemoteDataSource.kt +++ b/app/src/main/java/com/scentsnote/android/data/remote/RemoteDataSource.kt @@ -56,5 +56,5 @@ interface RemoteDataSource { suspend fun getRecommendPerfumeList(token: String) : MutableList suspend fun getCommonPerfumeList(token: String) : MutableList suspend fun getRecentPerfumeList(token: String) : MutableList - suspend fun getNewPerfumeList() : MutableList + suspend fun getNewPerfumeList(requestSize: Int?) : MutableList } \ No newline at end of file diff --git a/app/src/main/java/com/scentsnote/android/data/remote/RemoteDataSourceImpl.kt b/app/src/main/java/com/scentsnote/android/data/remote/RemoteDataSourceImpl.kt index 1c0c89f7..470603a0 100644 --- a/app/src/main/java/com/scentsnote/android/data/remote/RemoteDataSourceImpl.kt +++ b/app/src/main/java/com/scentsnote/android/data/remote/RemoteDataSourceImpl.kt @@ -87,8 +87,8 @@ class RemoteDataSourceImpl : RemoteDataSource{ return api.getRecentList(token).data.rows } - override suspend fun getNewPerfumeList(): MutableList { - return api.getNewPerfumeList().data.rows + override suspend fun getNewPerfumeList(requestSize: Int?): MutableList { + return api.getNewPerfumeList(requestSize).data.rows } override suspend fun getReview(reviewIdx: Int): ResponseReview { diff --git a/app/src/main/java/com/scentsnote/android/data/remote/network/ScentsNoteService.kt b/app/src/main/java/com/scentsnote/android/data/remote/network/ScentsNoteService.kt index 67e7cf26..d6d149e7 100644 --- a/app/src/main/java/com/scentsnote/android/data/remote/network/ScentsNoteService.kt +++ b/app/src/main/java/com/scentsnote/android/data/remote/network/ScentsNoteService.kt @@ -117,7 +117,7 @@ interface ScentsNoteService { // Home - New Perfume List @GET("perfume/new") suspend fun getNewPerfumeList( - + @Query("requestSize") requestSize : Int? ):ResponseBase @GET("perfume/{perfumeIdx}") diff --git a/app/src/main/java/com/scentsnote/android/data/repository/HomeRepository.kt b/app/src/main/java/com/scentsnote/android/data/repository/HomeRepository.kt index 97e7dfbf..570dcc15 100644 --- a/app/src/main/java/com/scentsnote/android/data/repository/HomeRepository.kt +++ b/app/src/main/java/com/scentsnote/android/data/repository/HomeRepository.kt @@ -12,7 +12,7 @@ class HomeRepository { suspend fun getRecommendPerfumeList(token : String) = remoteDataSource.getRecommendPerfumeList(token) suspend fun getCommonPerfumeList(token : String) = remoteDataSource.getCommonPerfumeList(token) suspend fun getRecentPerfumeList(token : String) = remoteDataSource.getRecentPerfumeList(token) - suspend fun getNewPerfumeList() = remoteDataSource.getNewPerfumeList() + suspend fun getNewPerfumeList(requestSize: Int?) = remoteDataSource.getNewPerfumeList(requestSize) fun postPerfumeLike(token: String, perfumeIdx: Int): Single> = ScentsNoteServiceImpl.service.postPerfumeLike(token, perfumeIdx).map { it } } \ No newline at end of file diff --git a/app/src/main/java/com/scentsnote/android/ui/home/HomeFragment.kt b/app/src/main/java/com/scentsnote/android/ui/home/HomeFragment.kt index a35a9df2..6cc0e37c 100644 --- a/app/src/main/java/com/scentsnote/android/ui/home/HomeFragment.kt +++ b/app/src/main/java/com/scentsnote/android/ui/home/HomeFragment.kt @@ -8,7 +8,9 @@ import android.view.View import android.view.ViewGroup import androidx.fragment.app.Fragment import androidx.fragment.app.viewModels +import androidx.lifecycle.Lifecycle import androidx.lifecycle.lifecycleScope +import androidx.lifecycle.repeatOnLifecycle import com.scentsnote.android.ScentsNoteApplication import com.scentsnote.android.R import com.scentsnote.android.ScentsNoteApplication.Companion.firebaseAnalytics @@ -22,6 +24,7 @@ import com.scentsnote.android.utils.extension.setHeartBtnClickEvent import com.scentsnote.android.viewmodel.home.HomeViewModel import com.scentsnote.android.utils.extension.setOnSafeClickListener import com.scentsnote.android.utils.extension.setPageViewEvent +import kotlinx.coroutines.launch import java.util.* /** @@ -71,8 +74,11 @@ class HomeFragment : Fragment() { override fun onResume() { super.onResume() - viewLifecycleOwner.lifecycleScope.launchWhenCreated { - homeViewModel.getHomePerfumeList() + viewLifecycleOwner.lifecycleScope.launch { + homeViewModel.run { + getHomePerfumeList() + getNewPerfumeList(10) + } } firebaseAnalytics.setPageViewEvent("HomePage",this::class.java.name) diff --git a/app/src/main/java/com/scentsnote/android/ui/home/MoreNewPerfumeActivity.kt b/app/src/main/java/com/scentsnote/android/ui/home/MoreNewPerfumeActivity.kt index c9b504c6..8a622dbe 100644 --- a/app/src/main/java/com/scentsnote/android/ui/home/MoreNewPerfumeActivity.kt +++ b/app/src/main/java/com/scentsnote/android/ui/home/MoreNewPerfumeActivity.kt @@ -6,6 +6,9 @@ import android.view.View import androidx.activity.viewModels import androidx.appcompat.app.AppCompatActivity import androidx.databinding.DataBindingUtil +import androidx.lifecycle.Lifecycle +import androidx.lifecycle.lifecycleScope +import androidx.lifecycle.repeatOnLifecycle import com.scentsnote.android.R import com.scentsnote.android.ScentsNoteApplication.Companion.firebaseAnalytics import com.scentsnote.android.databinding.ActivityMoreNewPerfumeBinding @@ -14,6 +17,7 @@ import com.scentsnote.android.viewmodel.home.HomeViewModel import com.scentsnote.android.utils.base.BaseWebViewActivity import com.scentsnote.android.utils.extension.setHeartBtnClickEvent import com.scentsnote.android.utils.extension.setPageViewEvent +import kotlinx.coroutines.launch /** * 홈 화면 - 새로운 향수 더보기 @@ -31,6 +35,10 @@ class MoreNewPerfumeActivity : AppCompatActivity() { binding.lifecycleOwner = this binding.viewModel = homeViewModel + lifecycleScope.launch { + homeViewModel.getNewPerfumeList(null) + } + initNewList() } diff --git a/app/src/main/java/com/scentsnote/android/viewmodel/home/HomeViewModel.kt b/app/src/main/java/com/scentsnote/android/viewmodel/home/HomeViewModel.kt index 0a35691a..cdf441f3 100644 --- a/app/src/main/java/com/scentsnote/android/viewmodel/home/HomeViewModel.kt +++ b/app/src/main/java/com/scentsnote/android/viewmodel/home/HomeViewModel.kt @@ -36,17 +36,10 @@ class HomeViewModel : ViewModel(){ val newPerfumeList : LiveData> get() = _newPerfumeList - init { - viewModelScope.launch { - getHomePerfumeList() - } - } - suspend fun getHomePerfumeList(){ getRecommendPerfumeList() getCommonPerfumeList() getRecentPerfumeList() - getNewPerfumeList() } private suspend fun getRecommendPerfumeList(){ @@ -77,9 +70,9 @@ class HomeViewModel : ViewModel(){ } } - private suspend fun getNewPerfumeList(){ + suspend fun getNewPerfumeList(requestSize: Int?){ try{ - _newPerfumeList.value = homeRepository.getNewPerfumeList() + _newPerfumeList.value = homeRepository.getNewPerfumeList(requestSize) Log.d("getNewPerfumeList", _newPerfumeList.value.toString()) }catch (e : HttpException){ Log.d("getNewPerfumeList error", e.message()) From f4d6e2246ada61bb94d199955ab9776c0778f3b0 Mon Sep 17 00:00:00 2001 From: Haeeul Date: Mon, 19 Feb 2024 09:52:50 +0900 Subject: [PATCH 11/11] =?UTF-8?q?[=EC=95=B1=20=EC=8B=AC=EC=82=AC=20?= =?UTF-8?q?=EC=9A=94=EC=B2=AD]=20v1.5.6(16)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- buildSrc/src/main/java/ConfigData.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/buildSrc/src/main/java/ConfigData.kt b/buildSrc/src/main/java/ConfigData.kt index 2c484364..6be961af 100644 --- a/buildSrc/src/main/java/ConfigData.kt +++ b/buildSrc/src/main/java/ConfigData.kt @@ -3,8 +3,8 @@ object ConfigData { const val buildToolsVersion = "30.0.3" const val minSdkVersion = 23 const val targetSdkVersion = 33 - const val versionCode = 15 - const val versionName = "1.5.5" + const val versionCode = 16 + const val versionName = "1.5.6" // gradle const val gradleVersion = "7.3.1"