-
Notifications
You must be signed in to change notification settings - Fork 0
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
정보 수정 요청 화면 추가 #99
Merged
Merged
정보 수정 요청 화면 추가 #99
Changes from all commits
Commits
Show all changes
20 commits
Select commit
Hold shift + click to select a range
cdfe44b
정보 수청 요청 모듈 추가
easyhooon 22a153a
style check success
easyhooon 8622cde
add: 정보수정요청 UI, xml
kymjaehong 52b11d1
edit: 불필요한 코드 제거 (#99)
bb23d25
edit: 카페 메뉴 수정 페이지 (#99)
48b3aaa
edit: 툴바 영역 height 100->56dp (#99)
769fa6d
edit: ic_menu_gray400 click 시, 보이는 선택 이미지 (#99)
d5b506a
edit: ScrollView-> NestScrollView, 메뉴 수정 화면 (#99)
c7ed64a
delete: 카페 등록, 메뉴 수정 완료 화면 뷰모델 파일 (#99)
21e353f
edit: pr 에러 수정 (#99)
1096faf
edit: NestScrollView & RecyclerView -> RecyclerView
kymjaehong 6181984
edit: navigation
kymjaehong f30fdf9
edit: RecyclerView 고정 marginBottom 제거 (#99)
kymjaehong ad10186
edit: 카페 제안하기 check box
kymjaehong b8406a9
edit: nav_gragh에서 카페 제안하기 코드 주석
kymjaehong 16651fc
edit: tool bar
kymjaehong bad88ba
add: fragment 이동, v1
kymjaehong bfa0f72
edit: style check
kymjaehong a7f1281
add: 정보수정-> 개선 요청에 따른 버튼 클릭 및 화면 이동
kymjaehong 36b2b8d
update CODEOWNERS
easyhooon File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
Binary file not shown.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -46,6 +46,7 @@ dependencies { | |
projects.setting, | ||
projects.designResource, | ||
projects.common, | ||
projects.updateCafe, | ||
) | ||
} | ||
|
||
|
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
15 changes: 15 additions & 0 deletions
15
design-resource/src/main/res/drawable/ic_menu_gray400_24.xml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,15 @@ | ||
<vector xmlns:android="http://schemas.android.com/apk/res/android" | ||
android:width="24dp" | ||
android:height="24dp" | ||
android:viewportWidth="24" | ||
android:viewportHeight="24"> | ||
<path | ||
android:pathData="M12,4m-0,-2a2,2 0,1 1,-0 4a2,2 0,1 1,-0 -4" | ||
android:fillColor="#9CA3AF"/> | ||
<path | ||
android:pathData="M12,12m-0,-2a2,2 0,1 1,-0 4a2,2 0,1 1,-0 -4" | ||
android:fillColor="#9CA3AF"/> | ||
<path | ||
android:pathData="M12,20m-0,-2a2,2 0,1 1,-0 4a2,2 0,1 1,-0 -4" | ||
android:fillColor="#9CA3AF"/> | ||
</vector> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,13 @@ | ||
<vector xmlns:android="http://schemas.android.com/apk/res/android" | ||
android:width="20dp" | ||
android:height="20dp" | ||
android:viewportWidth="20" | ||
android:viewportHeight="20"> | ||
<path | ||
android:strokeWidth="1" | ||
android:pathData="M13.333,5V4.333C13.333,3.4 13.333,2.933 13.152,2.577C12.992,2.263 12.737,2.008 12.423,1.848C12.067,1.667 11.6,1.667 10.667,1.667H9.333C8.4,1.667 7.933,1.667 7.577,1.848C7.263,2.008 7.008,2.263 6.848,2.577C6.667,2.933 6.667,3.4 6.667,4.333V5M8.333,9.583V13.75M11.667,9.583V13.75M2.5,5H17.5M15.833,5V14.333C15.833,15.733 15.833,16.434 15.561,16.968C15.321,17.439 14.939,17.821 14.468,18.061C13.934,18.333 13.233,18.333 11.833,18.333H8.167C6.767,18.333 6.066,18.333 5.532,18.061C5.061,17.821 4.679,17.439 4.439,16.968C4.167,16.434 4.167,15.733 4.167,14.333V5" | ||
android:strokeLineJoin="round" | ||
android:fillColor="#00000000" | ||
android:strokeColor="#6B7280" | ||
android:strokeLineCap="round"/> | ||
</vector> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -39,4 +39,5 @@ include( | |
":setting", | ||
":common", | ||
":design-resource", | ||
":update-cafe", | ||
) |
Validating CODEOWNERS rules …
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,2 @@ | ||
* @easyhooon | ||
* @kymjaehong |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,38 @@ | ||
/* | ||
* Designed and developed by Wedemy 2023. | ||
* | ||
* Licensed under the MIT. | ||
* Please see full license: https://github.com/Wedemy/eggeum-android/blob/main/LICENSE | ||
*/ | ||
|
||
@file:Suppress("UnstableApiUsage", "INLINE_FROM_HIGHER_PLATFORM") | ||
|
||
plugins { | ||
eggeum("android-library") | ||
eggeum("android-hilt") | ||
alias(libs.plugins.androidx.navigation.safeargs) | ||
`kotlin-parcelize` | ||
} | ||
|
||
android { | ||
namespace = "us.wedemy.eggeum.android.updatecafe" | ||
|
||
buildFeatures { | ||
viewBinding = true | ||
buildConfig = true | ||
} | ||
} | ||
|
||
dependencies { | ||
implementations( | ||
libs.kotlinx.coroutines.android, | ||
libs.android.material, | ||
libs.androidx.core, | ||
libs.androidx.constraintlayout, | ||
libs.bundles.androidx.lifecycle, | ||
libs.bundles.androidx.navigation, | ||
libs.timber, | ||
projects.common, | ||
projects.designResource, | ||
) | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,18 @@ | ||
<?xml version="1.0" encoding="utf-8"?><!-- | ||
~ Designed and developed by Wedemy 2023. | ||
~ | ||
~ Licensed under the MIT. | ||
~ Please see full license: https://github.com/Wedemy/eggeum-android/blob/main/LICENSE | ||
--> | ||
<manifest xmlns:android="http://schemas.android.com/apk/res/android"> | ||
|
||
<application> | ||
<activity | ||
android:name=".ui.UpdateCafeActivity" | ||
android:exported="true" | ||
android:theme="@style/Theme.Eggeum.UpdateCafe" | ||
android:windowSoftInputMode="adjustPan" /> | ||
|
||
</application> | ||
|
||
</manifest> |
38 changes: 38 additions & 0 deletions
38
...e-cafe/src/main/kotlin/us/wedemy/eggeum/android/updatecafe/ui/InputCafeAddressFragment.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,38 @@ | ||
/* | ||
* Designed and developed by Wedemy 2023. | ||
* | ||
* Licensed under the MIT. | ||
* Please see full license: https://github.com/Wedemy/eggeum-android/blob/main/LICENSE | ||
*/ | ||
|
||
@file:Suppress("unused", "UnusedPrivateProperty") | ||
|
||
package us.wedemy.eggeum.android.updatecafe.ui | ||
|
||
import android.os.Bundle | ||
import android.view.View | ||
import androidx.fragment.app.viewModels | ||
import dagger.hilt.android.AndroidEntryPoint | ||
import us.wedemy.eggeum.android.common.ui.BaseFragment | ||
import us.wedemy.eggeum.android.updatecafe.databinding.FragmentInputCafeAddressBinding | ||
import us.wedemy.eggeum.android.updatecafe.viewmodel.InputCafeAddressViewModel | ||
|
||
@AndroidEntryPoint | ||
class InputCafeAddressFragment : BaseFragment<FragmentInputCafeAddressBinding>() { | ||
override fun getViewBinding() = FragmentInputCafeAddressBinding.inflate(layoutInflater) | ||
|
||
private val viewModel by viewModels<InputCafeAddressViewModel>() | ||
|
||
override fun onViewCreated(view: View, savedInstanceState: Bundle?) { | ||
initListener() | ||
initObserver() | ||
} | ||
|
||
private fun initListener() { | ||
// TODO | ||
} | ||
|
||
private fun initObserver() { | ||
// TODO | ||
} | ||
} |
45 changes: 45 additions & 0 deletions
45
update-cafe/src/main/kotlin/us/wedemy/eggeum/android/updatecafe/ui/InputCafeInfoFragment.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,45 @@ | ||
/* | ||
* Designed and developed by Wedemy 2023. | ||
* | ||
* Licensed under the MIT. | ||
* Please see full license: https://github.com/Wedemy/eggeum-android/blob/main/LICENSE | ||
*/ | ||
|
||
@file:Suppress("unused", "UnusedPrivateProperty") | ||
|
||
package us.wedemy.eggeum.android.updatecafe.ui | ||
|
||
import android.os.Bundle | ||
import android.view.View | ||
import androidx.fragment.app.viewModels | ||
import androidx.navigation.fragment.findNavController | ||
import dagger.hilt.android.AndroidEntryPoint | ||
import us.wedemy.eggeum.android.common.ui.BaseFragment | ||
import us.wedemy.eggeum.android.updatecafe.databinding.FragmentInputCafeInfoBinding | ||
import us.wedemy.eggeum.android.updatecafe.viewmodel.InputCafeInfoViewModel | ||
|
||
@AndroidEntryPoint | ||
class InputCafeInfoFragment : BaseFragment<FragmentInputCafeInfoBinding>() { | ||
override fun getViewBinding() = FragmentInputCafeInfoBinding.inflate(layoutInflater) | ||
|
||
private val viewModel by viewModels<InputCafeInfoViewModel>() | ||
|
||
override fun onViewCreated(view: View, savedInstanceState: Bundle?) { | ||
initListener() | ||
initObserver() | ||
} | ||
|
||
private fun initListener() { | ||
with(binding) { | ||
tbSelectInputCafeInfo.setNavigationOnClickListener { | ||
if (!findNavController().navigateUp()) { | ||
requireActivity().finish() | ||
} | ||
} | ||
} | ||
} | ||
|
||
private fun initObserver() { | ||
// TODO | ||
} | ||
} |
45 changes: 45 additions & 0 deletions
45
update-cafe/src/main/kotlin/us/wedemy/eggeum/android/updatecafe/ui/InputCafeMenuFragment.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,45 @@ | ||
/* | ||
* Designed and developed by Wedemy 2023. | ||
* | ||
* Licensed under the MIT. | ||
* Please see full license: https://github.com/Wedemy/eggeum-android/blob/main/LICENSE | ||
*/ | ||
|
||
@file:Suppress("unused", "UnusedPrivateProperty") | ||
|
||
package us.wedemy.eggeum.android.updatecafe.ui | ||
|
||
import android.os.Bundle | ||
import android.view.View | ||
import androidx.fragment.app.viewModels | ||
import androidx.navigation.fragment.findNavController | ||
import dagger.hilt.android.AndroidEntryPoint | ||
import us.wedemy.eggeum.android.common.extension.safeNavigate | ||
import us.wedemy.eggeum.android.common.ui.BaseFragment | ||
import us.wedemy.eggeum.android.updatecafe.databinding.FragmentInputCafeMenuBinding | ||
import us.wedemy.eggeum.android.updatecafe.viewmodel.InputCafeMenuViewModel | ||
|
||
@AndroidEntryPoint | ||
class InputCafeMenuFragment : BaseFragment<FragmentInputCafeMenuBinding>() { | ||
override fun getViewBinding() = FragmentInputCafeMenuBinding.inflate(layoutInflater) | ||
|
||
private val viewModel by viewModels<InputCafeMenuViewModel>() | ||
|
||
override fun onViewCreated(view: View, savedInstanceState: Bundle?) { | ||
initListener() | ||
initObserver() | ||
} | ||
|
||
private fun initListener() { | ||
with(binding) { | ||
btnUpdateMenuComplete.setOnClickListener { | ||
val action = InputCafeMenuFragmentDirections.actionInputCafeMenuFragmentToUpdateMenuCompleteFragment() | ||
findNavController().safeNavigate(action) | ||
} | ||
} | ||
} | ||
|
||
private fun initObserver() { | ||
// TODO | ||
} | ||
} |
38 changes: 38 additions & 0 deletions
38
update-cafe/src/main/kotlin/us/wedemy/eggeum/android/updatecafe/ui/InputCafeNameFragment.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,38 @@ | ||
/* | ||
* Designed and developed by Wedemy 2023. | ||
* | ||
* Licensed under the MIT. | ||
* Please see full license: https://github.com/Wedemy/eggeum-android/blob/main/LICENSE | ||
*/ | ||
|
||
@file:Suppress("unused", "UnusedPrivateProperty") | ||
|
||
package us.wedemy.eggeum.android.updatecafe.ui | ||
|
||
import android.os.Bundle | ||
import android.view.View | ||
import androidx.fragment.app.viewModels | ||
import dagger.hilt.android.AndroidEntryPoint | ||
import us.wedemy.eggeum.android.common.ui.BaseFragment | ||
import us.wedemy.eggeum.android.updatecafe.databinding.FragmentInputCafeNameBinding | ||
import us.wedemy.eggeum.android.updatecafe.viewmodel.InputCafeNameViewModel | ||
|
||
@AndroidEntryPoint | ||
class InputCafeNameFragment : BaseFragment<FragmentInputCafeNameBinding>() { | ||
override fun getViewBinding() = FragmentInputCafeNameBinding.inflate(layoutInflater) | ||
|
||
private val viewModel by viewModels<InputCafeNameViewModel>() | ||
|
||
override fun onViewCreated(view: View, savedInstanceState: Bundle?) { | ||
initListener() | ||
initObserver() | ||
} | ||
|
||
private fun initListener() { | ||
// TODO | ||
} | ||
|
||
private fun initObserver() { | ||
// TODO | ||
} | ||
} |
38 changes: 38 additions & 0 deletions
38
...fe/src/main/kotlin/us/wedemy/eggeum/android/updatecafe/ui/SelectCafeCategoriesFragment.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,38 @@ | ||
/* | ||
* Designed and developed by Wedemy 2023. | ||
* | ||
* Licensed under the MIT. | ||
* Please see full license: https://github.com/Wedemy/eggeum-android/blob/main/LICENSE | ||
*/ | ||
|
||
@file:Suppress("unused", "UnusedPrivateProperty") | ||
|
||
package us.wedemy.eggeum.android.updatecafe.ui | ||
|
||
import android.os.Bundle | ||
import android.view.View | ||
import androidx.fragment.app.viewModels | ||
import dagger.hilt.android.AndroidEntryPoint | ||
import us.wedemy.eggeum.android.common.ui.BaseFragment | ||
import us.wedemy.eggeum.android.updatecafe.databinding.FragmentSelectCafeCategoriesBinding | ||
import us.wedemy.eggeum.android.updatecafe.viewmodel.SelectCafeCategoriesViewModel | ||
|
||
@AndroidEntryPoint | ||
class SelectCafeCategoriesFragment : BaseFragment<FragmentSelectCafeCategoriesBinding>() { | ||
override fun getViewBinding() = FragmentSelectCafeCategoriesBinding.inflate(layoutInflater) | ||
|
||
private val viewModel by viewModels<SelectCafeCategoriesViewModel>() | ||
|
||
override fun onViewCreated(view: View, savedInstanceState: Bundle?) { | ||
initListener() | ||
initObserver() | ||
} | ||
|
||
private fun initListener() { | ||
// TODO | ||
} | ||
|
||
private fun initObserver() { | ||
// TODO | ||
} | ||
} |
51 changes: 51 additions & 0 deletions
51
update-cafe/src/main/kotlin/us/wedemy/eggeum/android/updatecafe/ui/SelectCafeMenuFragment.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,51 @@ | ||
/* | ||
* Designed and developed by Wedemy 2023. | ||
* | ||
* Licensed under the MIT. | ||
* Please see full license: https://github.com/Wedemy/eggeum-android/blob/main/LICENSE | ||
*/ | ||
|
||
@file:Suppress("unused", "UnusedPrivateProperty") | ||
|
||
package us.wedemy.eggeum.android.updatecafe.ui | ||
|
||
import android.os.Bundle | ||
import android.view.View | ||
import androidx.fragment.app.viewModels | ||
import androidx.navigation.fragment.findNavController | ||
import dagger.hilt.android.AndroidEntryPoint | ||
import us.wedemy.eggeum.android.common.extension.safeNavigate | ||
import us.wedemy.eggeum.android.common.ui.BaseFragment | ||
import us.wedemy.eggeum.android.updatecafe.databinding.FragmentSelectCafeMenuBinding | ||
import us.wedemy.eggeum.android.updatecafe.viewmodel.SelectCafeMenuViewModel | ||
|
||
@AndroidEntryPoint | ||
class SelectCafeMenuFragment : BaseFragment<FragmentSelectCafeMenuBinding>() { | ||
override fun getViewBinding() = FragmentSelectCafeMenuBinding.inflate(layoutInflater) | ||
|
||
private val viewModel by viewModels<SelectCafeMenuViewModel>() | ||
|
||
override fun onViewCreated(view: View, savedInstanceState: Bundle?) { | ||
initListener() | ||
initObserver() | ||
} | ||
|
||
private fun initListener() { | ||
with(binding) { | ||
tbSelectInputCafeMenu.setNavigationOnClickListener { | ||
if (!findNavController().navigateUp()) { | ||
requireActivity().finish() | ||
} | ||
} | ||
|
||
btnInputCafeMenu.setOnClickListener { | ||
val action = SelectCafeMenuFragmentDirections.actionSelectCafeMenuFragmentToInputCafeMenuFragment() | ||
findNavController().safeNavigate(action) | ||
} | ||
} | ||
} | ||
|
||
private fun initObserver() { | ||
// TODO | ||
} | ||
} |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
binding.~ 으로 접근할 변수가 2개 이상일 경우 with(binding) {} 으로 묶는 게 좋은데
해당 화면 구현 종료 후 binding.~ 으로 접근하는 녀석이 최종적으로 1개 뿐이라면 with 으로 묶어 줄 필요는 없을 것 같아요
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
네 다음 작업할 때, 수정하겠습니다