From 9188c52c806e81911fbb48e1e7f30f8383760c24 Mon Sep 17 00:00:00 2001 From: Seungmin-develop Date: Mon, 7 Mar 2022 23:08:23 +0900 Subject: [PATCH] [feat] #101 Change View --- .../category/model/ApplyProjectService.kt | 12 - ...AllProjectService.kt => ProjectService.kt} | 11 +- .../category/view/adapter/IdeaListAdapter.kt | 1 + .../view/fragment/CategoryFragment.kt | 13 +- .../view/fragment/CategoryViewIdeaFragment.kt | 2 +- .../view/fragment/IdeaListFragment.kt | 2 +- .../view/fragment/CreateProjectFragment.kt | 85 ++- .../home/viewmodel/CreateProjectViewModel.kt | 7 + .../myideamanage/view/WarningDeleteDialog.kt | 53 ++ .../view/fragment/MyIdeaFragment.kt | 7 + .../MyProjectMoreMenuBottomSheetFragment.kt | 48 ++ .../infraandroid/util/BindingConversion.kt | 1 + .../infraandroid/util/ServiceCreator.kt | 7 +- .../res/drawable/edittext_box_background.xml | 2 +- .../main/res/drawable/ic_create_project.xml | 9 + .../main/res/drawable/ic_delete_hashtag.xml | 9 + app/src/main/res/drawable/ic_edit_button.xml | 10 + .../main/res/drawable/ic_start_chatting.xml | 16 + app/src/main/res/layout/fragment_category.xml | 37 + .../res/layout/fragment_create_project.xml | 201 ++++-- .../main/res/layout/fragment_idea_list.xml | 2 +- .../res/layout/fragment_my_info_modify.xml | 2 +- .../res/layout/fragment_my_info_my_idea.xml | 2 +- .../fragment_my_info_project_modify.xml | 8 +- .../main/res/layout/fragment_view_idea.xml | 660 ++++++++++-------- .../my_info_my_project_delete_warning.xml | 88 +++ app/src/main/res/layout/my_info_team_idea.xml | 19 +- .../layout/my_info_team_member_evaluation.xml | 2 +- .../main/res/layout/my_project_more_menu.xml | 94 +++ app/src/main/res/navigation/nav_graph.xml | 12 + 30 files changed, 1018 insertions(+), 404 deletions(-) delete mode 100644 app/src/main/java/com/example/infraandroid/category/model/ApplyProjectService.kt rename app/src/main/java/com/example/infraandroid/category/model/{LookUpAllProjectService.kt => ProjectService.kt} (58%) create mode 100644 app/src/main/java/com/example/infraandroid/myinfo/myideamanage/view/WarningDeleteDialog.kt create mode 100644 app/src/main/java/com/example/infraandroid/myinfo/myideamanage/view/fragment/MyProjectMoreMenuBottomSheetFragment.kt create mode 100644 app/src/main/res/drawable/ic_create_project.xml create mode 100644 app/src/main/res/drawable/ic_delete_hashtag.xml create mode 100644 app/src/main/res/drawable/ic_edit_button.xml create mode 100644 app/src/main/res/drawable/ic_start_chatting.xml create mode 100644 app/src/main/res/layout/my_info_my_project_delete_warning.xml create mode 100644 app/src/main/res/layout/my_project_more_menu.xml diff --git a/app/src/main/java/com/example/infraandroid/category/model/ApplyProjectService.kt b/app/src/main/java/com/example/infraandroid/category/model/ApplyProjectService.kt deleted file mode 100644 index 1001ac6..0000000 --- a/app/src/main/java/com/example/infraandroid/category/model/ApplyProjectService.kt +++ /dev/null @@ -1,12 +0,0 @@ -package com.example.infraandroid.category.model - -import retrofit2.Call -import retrofit2.http.Body -import retrofit2.http.POST - -interface ApplyProjectService { - @POST("/project/apply") - fun postApplyProject( - @Body body : RequestApplyProjectData - ): Call -} \ No newline at end of file diff --git a/app/src/main/java/com/example/infraandroid/category/model/LookUpAllProjectService.kt b/app/src/main/java/com/example/infraandroid/category/model/ProjectService.kt similarity index 58% rename from app/src/main/java/com/example/infraandroid/category/model/LookUpAllProjectService.kt rename to app/src/main/java/com/example/infraandroid/category/model/ProjectService.kt index ede93fb..052a66a 100644 --- a/app/src/main/java/com/example/infraandroid/category/model/LookUpAllProjectService.kt +++ b/app/src/main/java/com/example/infraandroid/category/model/ProjectService.kt @@ -1,14 +1,17 @@ package com.example.infraandroid.category.model import retrofit2.Call -import retrofit2.http.GET -import retrofit2.http.Header -import retrofit2.http.Query +import retrofit2.http.* -interface LookUpAllProjectService { +interface ProjectService { @GET("/project/inquiry?") fun getLookUpAllProject( @Header("X-ACCESS-TOKEN") jwt: String, @Query("user_id") user_id : String ): Call + + @POST("/project/apply") + fun postApplyProject( + @Body body : RequestApplyProjectData + ): Call } \ No newline at end of file diff --git a/app/src/main/java/com/example/infraandroid/category/view/adapter/IdeaListAdapter.kt b/app/src/main/java/com/example/infraandroid/category/view/adapter/IdeaListAdapter.kt index d47ce67..b6f395a 100644 --- a/app/src/main/java/com/example/infraandroid/category/view/adapter/IdeaListAdapter.kt +++ b/app/src/main/java/com/example/infraandroid/category/view/adapter/IdeaListAdapter.kt @@ -36,6 +36,7 @@ class IdeaListAdapter(): RecyclerView.Adapter() { itemView.setOnClickListener { it.findNavController().navigate(R.id.action_idea_list_fragment_to_categoryViewIdeaFragment) + } } } diff --git a/app/src/main/java/com/example/infraandroid/category/view/fragment/CategoryFragment.kt b/app/src/main/java/com/example/infraandroid/category/view/fragment/CategoryFragment.kt index f35095a..5609319 100644 --- a/app/src/main/java/com/example/infraandroid/category/view/fragment/CategoryFragment.kt +++ b/app/src/main/java/com/example/infraandroid/category/view/fragment/CategoryFragment.kt @@ -7,7 +7,9 @@ import android.view.LayoutInflater import android.view.View import android.view.ViewGroup import androidx.fragment.app.Fragment +import androidx.navigation.findNavController import androidx.viewpager2.widget.ViewPager2 +import com.example.infraandroid.R import com.example.infraandroid.category.view.adapter.CategoryPagerAdapter import com.example.infraandroid.databinding.FragmentCategoryBinding import com.google.android.material.tabs.TabLayout @@ -37,6 +39,11 @@ class CategoryFragment : Fragment() { } override fun onViewCreated(view: View, savedInstanceState: Bundle?) { + + mBinding?.createProjectConstraintLayout?.setOnClickListener { + it.findNavController().navigate(R.id.action_category_fragment_to_createProjectFragment) + } + super.onViewCreated(view, savedInstanceState) } @@ -58,10 +65,8 @@ class CategoryFragment : Fragment() { TabLayoutMediator(tabLayout, viewPager){tab, position -> when(position){ - 0->{ - tab.text = "아이디어" - } - 1->tab.text = "팀원" + 0-> tab.text = "아이디어" + 1-> tab.text = "팀원" } }.attach() diff --git a/app/src/main/java/com/example/infraandroid/category/view/fragment/CategoryViewIdeaFragment.kt b/app/src/main/java/com/example/infraandroid/category/view/fragment/CategoryViewIdeaFragment.kt index a10e4f9..34897d3 100644 --- a/app/src/main/java/com/example/infraandroid/category/view/fragment/CategoryViewIdeaFragment.kt +++ b/app/src/main/java/com/example/infraandroid/category/view/fragment/CategoryViewIdeaFragment.kt @@ -43,7 +43,7 @@ class CategoryViewIdeaFragment : Fragment(){ userId = InfraApplication.prefs.getString("userId", "null") ) - val call: Call = ServiceCreator.applyProjectService + val call: Call = ServiceCreator.projectService .postApplyProject(requestApplyProjectData) call.enqueue(object:Callback{ override fun onResponse( diff --git a/app/src/main/java/com/example/infraandroid/category/view/fragment/IdeaListFragment.kt b/app/src/main/java/com/example/infraandroid/category/view/fragment/IdeaListFragment.kt index 4c1c024..f969145 100644 --- a/app/src/main/java/com/example/infraandroid/category/view/fragment/IdeaListFragment.kt +++ b/app/src/main/java/com/example/infraandroid/category/view/fragment/IdeaListFragment.kt @@ -28,7 +28,7 @@ class IdeaListFragment : BaseFragment(R.layout.fragment override fun FragmentIdeaListBinding.onViewCreated(){ binding.ideaListRecyclerView.adapter = ideaListAdapter - val call: Call = ServiceCreator.lookUpAllProjectService + val call: Call = ServiceCreator.projectService .getLookUpAllProject(InfraApplication.prefs.getString("jwt","null"), InfraApplication.prefs.getString("userId", "null")) call.enqueue(object : Callback{ diff --git a/app/src/main/java/com/example/infraandroid/home/view/fragment/CreateProjectFragment.kt b/app/src/main/java/com/example/infraandroid/home/view/fragment/CreateProjectFragment.kt index 81f5553..7b19e26 100644 --- a/app/src/main/java/com/example/infraandroid/home/view/fragment/CreateProjectFragment.kt +++ b/app/src/main/java/com/example/infraandroid/home/view/fragment/CreateProjectFragment.kt @@ -105,12 +105,71 @@ class CreateProjectFragment : Fragment() { override fun onViewCreated(view: View, savedInstanceState: Bundle?) { super.onViewCreated(view, savedInstanceState) val cal = Calendar.getInstance() - val projectRecruitStart = mBinding?.projectStartDateEditTextView val projectRecruitEnd = mBinding?.projectEndDateEditTextView val projectMakingStart = mBinding?.setProjectStartDateTextView val projectMakingEnd = mBinding?.projectEndMakingDateEditTextView val addFileButton = mBinding?.addFileTextView + viewModel?.hashTag?.observe(viewLifecycleOwner, Observer{ + when(it.size){ + 0 -> { + mBinding?.hashTagOneConstraintLayout?.isVisible = false + mBinding?.hashTagTwoConstraintLayout?.isVisible = false + mBinding?.hashTagThreeConstraintLayout?.isVisible = false + mBinding?.hashTagFourConstraintLayout?.isVisible = false + hashTagString = "" + } + 1 -> { + mBinding?.hashTagOneTextView?.text = it[0] + mBinding?.hashTagOneConstraintLayout?.isVisible = true + mBinding?.hashTagTwoConstraintLayout?.isVisible = false + mBinding?.hashTagThreeConstraintLayout?.isVisible = false + mBinding?.hashTagFourConstraintLayout?.isVisible = false + hashTagString = "\"${it[0]}\"" + } + 2 -> { + mBinding?.hashTagTwoTextView?.text = it[1] + mBinding?.hashTagOneConstraintLayout?.isVisible = true + mBinding?.hashTagTwoConstraintLayout?.isVisible = true + mBinding?.hashTagThreeConstraintLayout?.isVisible = false + mBinding?.hashTagFourConstraintLayout?.isVisible = false + hashTagString = "\"${it[0]}\",\"${it[1]}\"" + } + 3 -> { + mBinding?.hashTagThreeTextView?.text = it[2] + mBinding?.hashTagOneConstraintLayout?.isVisible = true + mBinding?.hashTagTwoConstraintLayout?.isVisible = true + mBinding?.hashTagThreeConstraintLayout?.isVisible = true + mBinding?.hashTagFourConstraintLayout?.isVisible = false + hashTagString = "\"${it[0]}\",\"${it[1]}\",\"${it[2]}\"" + } + 4 -> { + mBinding?.hashTagFourTextView?.text = it[3] + mBinding?.hashTagOneConstraintLayout?.isVisible = true + mBinding?.hashTagTwoConstraintLayout?.isVisible = true + mBinding?.hashTagThreeConstraintLayout?.isVisible = true + mBinding?.hashTagFourConstraintLayout?.isVisible = true + hashTagString = "\"${it[0]}\",\"${it[1]}\",\"${it[2]}\",\"${it[3]}\"" + } + } + }) + + mBinding?.hashTagOneConstraintLayout?.setOnClickListener { + viewModel?.deleteHashTag(0) + } + + mBinding?.hashTagTwoConstraintLayout?.setOnClickListener { + viewModel?.deleteHashTag(1) + } + + mBinding?.hashTagThreeConstraintLayout?.setOnClickListener { + viewModel?.deleteHashTag(2) + } + + mBinding?.hashTagFourConstraintLayout?.setOnClickListener { + viewModel?.deleteHashTag(3) + } + // 파일 첨부 버튼 눌렀을 때 addFileButton?.setOnClickListener { requestPermission() @@ -267,30 +326,6 @@ class CreateProjectFragment : Fragment() { if(mBinding?.hashTagEditText?.text.toString() != "") viewModel?.updateHashTag(mBinding?.hashTagEditText?.text.toString()) mBinding?.hashTagEditText?.setText("") - viewModel?.hashTag?.observe(viewLifecycleOwner, Observer{ - when(it.size){ - 1 -> { - mBinding?.hashTagOneTextView?.text = it[0] - mBinding?.hashTagOneTextView?.isVisible = true - hashTagString = "\"${it[0]}\"" - } - 2 -> { - mBinding?.hashTagTwoTextView?.text = it[1] - mBinding?.hashTagTwoTextView?.isVisible = true - hashTagString = "\"${it[0]}\",\"${it[1]}\"" - } - 3 -> { - mBinding?.hashTagThreeTextView?.text = it[2] - mBinding?.hashTagThreeTextView?.isVisible = true - hashTagString = "\"${it[0]}\",\"${it[1]}\",\"${it[2]}\"" - } - 4 -> { - mBinding?.hashTagFourTextView?.text = it[3] - mBinding?.hashTagFourTextView?.isVisible = true - hashTagString = "\"${it[0]}\",\"${it[1]}\",\"${it[2]}\",\"${it[3]}\"" - } - } - }) } // 날짜 선택하는 datepicker diff --git a/app/src/main/java/com/example/infraandroid/home/viewmodel/CreateProjectViewModel.kt b/app/src/main/java/com/example/infraandroid/home/viewmodel/CreateProjectViewModel.kt index 88777bf..ee859b2 100644 --- a/app/src/main/java/com/example/infraandroid/home/viewmodel/CreateProjectViewModel.kt +++ b/app/src/main/java/com/example/infraandroid/home/viewmodel/CreateProjectViewModel.kt @@ -94,4 +94,11 @@ class CreateProjectViewModel : ViewModel() { _currentHashTag.value = hashTagArrayList } } + + fun deleteHashTag(index: Int){ + if(hashTagArrayList.size>0) { + hashTagArrayList.removeAt(index) + _currentHashTag.value = hashTagArrayList + } + } } \ No newline at end of file diff --git a/app/src/main/java/com/example/infraandroid/myinfo/myideamanage/view/WarningDeleteDialog.kt b/app/src/main/java/com/example/infraandroid/myinfo/myideamanage/view/WarningDeleteDialog.kt new file mode 100644 index 0000000..f295f48 --- /dev/null +++ b/app/src/main/java/com/example/infraandroid/myinfo/myideamanage/view/WarningDeleteDialog.kt @@ -0,0 +1,53 @@ +package com.example.infraandroid.myinfo.myideamanage.view + +import android.content.res.Resources +import android.graphics.Rect +import android.os.Bundle +import android.view.LayoutInflater +import android.view.View +import android.view.ViewGroup +import androidx.fragment.app.DialogFragment +import com.example.infraandroid.R +import com.example.infraandroid.databinding.MyInfoMyProjectDeleteWarningBinding + +class WarningDeleteDialog: DialogFragment() { + private var mBinding : MyInfoMyProjectDeleteWarningBinding? = null + + override fun onCreateView( + inflater: LayoutInflater, + container: ViewGroup?, + savedInstanceState: Bundle? + ): View? { + val binding = MyInfoMyProjectDeleteWarningBinding.inflate(inflater, container, false) + mBinding = binding + + return mBinding?.root + } + + override fun onViewCreated(view: View, savedInstanceState: Bundle?) { + super.onViewCreated(view, savedInstanceState) + + mBinding?.warningOkayButton?.setOnClickListener { + // 삭제 버튼 눌렀을 때 + } + + mBinding?.warningCancelButton?.setOnClickListener { + dismiss() + } + } + + override fun onActivityCreated(savedInstanceState: Bundle?) { + super.onActivityCreated(savedInstanceState) + + setWidthPercent(90) + } + + fun DialogFragment.setWidthPercent(percentage: Int) { + val percent = percentage.toFloat() / 100 + val dm = Resources.getSystem().displayMetrics + val rect = dm.run { Rect(0, 0, widthPixels, heightPixels) } + val percentWidth = rect.width() * percent + dialog?.window?.setLayout(percentWidth.toInt(), ViewGroup.LayoutParams.WRAP_CONTENT) + dialog?.window?.setBackgroundDrawableResource(R.drawable.warning_background) + } +} \ No newline at end of file diff --git a/app/src/main/java/com/example/infraandroid/myinfo/myideamanage/view/fragment/MyIdeaFragment.kt b/app/src/main/java/com/example/infraandroid/myinfo/myideamanage/view/fragment/MyIdeaFragment.kt index cea1e35..de39673 100644 --- a/app/src/main/java/com/example/infraandroid/myinfo/myideamanage/view/fragment/MyIdeaFragment.kt +++ b/app/src/main/java/com/example/infraandroid/myinfo/myideamanage/view/fragment/MyIdeaFragment.kt @@ -35,6 +35,12 @@ class MyIdeaFragment : Fragment() { override fun onViewCreated(view: View, savedInstanceState: Bundle?) { super.onViewCreated(view, savedInstanceState) + + val bottomSheetDialogFragment = MyProjectMoreMenuBottomSheetFragment() + + mBinding?.moreImageButton?.setOnClickListener { + activity?.supportFragmentManager?.let { it1 -> bottomSheetDialogFragment.show(it1, bottomSheetDialogFragment.tag) } + } } override fun onActivityCreated(savedInstanceState: Bundle?) { @@ -54,6 +60,7 @@ class MyIdeaFragment : Fragment() { } }) + TabLayoutMediator(tabLayout, viewPager){tab, position -> when(position){ 0->{ diff --git a/app/src/main/java/com/example/infraandroid/myinfo/myideamanage/view/fragment/MyProjectMoreMenuBottomSheetFragment.kt b/app/src/main/java/com/example/infraandroid/myinfo/myideamanage/view/fragment/MyProjectMoreMenuBottomSheetFragment.kt new file mode 100644 index 0000000..67eb1b7 --- /dev/null +++ b/app/src/main/java/com/example/infraandroid/myinfo/myideamanage/view/fragment/MyProjectMoreMenuBottomSheetFragment.kt @@ -0,0 +1,48 @@ +package com.example.infraandroid.myinfo.myideamanage.view.fragment + +import android.annotation.SuppressLint +import android.app.Dialog +import android.content.DialogInterface +import android.os.Bundle +import android.util.Log +import android.view.LayoutInflater +import android.view.View +import android.view.ViewGroup +import androidx.navigation.findNavController +import androidx.navigation.fragment.NavHostFragment.findNavController +import androidx.navigation.fragment.findNavController +import com.example.infraandroid.R +import com.example.infraandroid.databinding.MyProjectMoreMenuBinding +import com.example.infraandroid.id.viewmodel.SignUpViewModel.Companion.TAG +import com.example.infraandroid.myinfo.myideamanage.view.WarningDeleteDialog +import com.google.android.material.bottomsheet.BottomSheetDialogFragment + +class MyProjectMoreMenuBottomSheetFragment : BottomSheetDialogFragment() { + private var mBinding : MyProjectMoreMenuBinding? = null + + override fun onCreateView( + inflater: LayoutInflater, + container: ViewGroup?, + savedInstanceState: Bundle? + ): View? { + val binding = MyProjectMoreMenuBinding.inflate(inflater, container, false) + mBinding = binding + + return mBinding?.root + } + + override fun onViewCreated(view: View, savedInstanceState: Bundle?) { + super.onViewCreated(view, savedInstanceState) + + val warningDeleteDialog = WarningDeleteDialog() + + mBinding?.editProjectConstraintLayout?.setOnClickListener { + dismiss() + findNavController().navigate(R.id.action_myInfoTeamIdeaFragment_to_myInfoProjectModifyFragment) + } + mBinding?.deleteProjectConstraintLayout?.setOnClickListener { + dismiss() + activity?.supportFragmentManager?.let { it1 -> warningDeleteDialog.show(it1, warningDeleteDialog.tag) } + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/example/infraandroid/util/BindingConversion.kt b/app/src/main/java/com/example/infraandroid/util/BindingConversion.kt index 8e0594f..ca3bc37 100644 --- a/app/src/main/java/com/example/infraandroid/util/BindingConversion.kt +++ b/app/src/main/java/com/example/infraandroid/util/BindingConversion.kt @@ -5,6 +5,7 @@ import android.content.res.ColorStateList import android.graphics.Color import android.widget.ImageView import android.widget.TextView +import androidx.constraintlayout.widget.ConstraintLayout import androidx.core.view.isGone import androidx.core.view.isVisible import androidx.databinding.BindingAdapter diff --git a/app/src/main/java/com/example/infraandroid/util/ServiceCreator.kt b/app/src/main/java/com/example/infraandroid/util/ServiceCreator.kt index b4c719e..1e1a952 100644 --- a/app/src/main/java/com/example/infraandroid/util/ServiceCreator.kt +++ b/app/src/main/java/com/example/infraandroid/util/ServiceCreator.kt @@ -1,9 +1,7 @@ package com.example.infraandroid.util -import com.example.infraandroid.category.model.ApplyProjectService -import com.example.infraandroid.category.model.LookUpAllProjectService +import com.example.infraandroid.category.model.ProjectService import com.example.infraandroid.home.model.CreateProjectService -import com.example.infraandroid.home.viewmodel.CreateProjectViewModel import com.example.infraandroid.myinfo.myintroductionpage.model.ProfileViewService import com.example.infraandroid.id.model.LoginService import com.example.infraandroid.id.model.SMSService @@ -35,6 +33,5 @@ object ServiceCreator { val sendSMSService : SMSService = retrofit.create(SMSService::class.java) val profileViewService : ProfileViewService = retrofit.create(ProfileViewService::class.java) val createProjectService : CreateProjectService = retrofit.create(CreateProjectService::class.java) - val applyProjectService : ApplyProjectService = retrofit.create(ApplyProjectService::class.java) - val lookUpAllProjectService : LookUpAllProjectService = retrofit.create(LookUpAllProjectService::class.java) + val projectService : ProjectService = retrofit.create(ProjectService::class.java) } \ No newline at end of file diff --git a/app/src/main/res/drawable/edittext_box_background.xml b/app/src/main/res/drawable/edittext_box_background.xml index e6b8919..1793588 100644 --- a/app/src/main/res/drawable/edittext_box_background.xml +++ b/app/src/main/res/drawable/edittext_box_background.xml @@ -8,6 +8,6 @@ android:topLeftRadius="19dp" android:topRightRadius="19dp"/> \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_create_project.xml b/app/src/main/res/drawable/ic_create_project.xml new file mode 100644 index 0000000..5cf3447 --- /dev/null +++ b/app/src/main/res/drawable/ic_create_project.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_delete_hashtag.xml b/app/src/main/res/drawable/ic_delete_hashtag.xml new file mode 100644 index 0000000..3d7ac65 --- /dev/null +++ b/app/src/main/res/drawable/ic_delete_hashtag.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_edit_button.xml b/app/src/main/res/drawable/ic_edit_button.xml new file mode 100644 index 0000000..afe97ce --- /dev/null +++ b/app/src/main/res/drawable/ic_edit_button.xml @@ -0,0 +1,10 @@ + + + diff --git a/app/src/main/res/drawable/ic_start_chatting.xml b/app/src/main/res/drawable/ic_start_chatting.xml new file mode 100644 index 0000000..e3392ba --- /dev/null +++ b/app/src/main/res/drawable/ic_start_chatting.xml @@ -0,0 +1,16 @@ + + + + diff --git a/app/src/main/res/layout/fragment_category.xml b/app/src/main/res/layout/fragment_category.xml index 7a3d907..daa49be 100644 --- a/app/src/main/res/layout/fragment_category.xml +++ b/app/src/main/res/layout/fragment_category.xml @@ -33,4 +33,41 @@ app:layout_constraintRight_toRightOf="parent" app:layout_constraintBottom_toBottomOf="parent"/> + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_create_project.xml b/app/src/main/res/layout/fragment_create_project.xml index 3f46981..cdbc7a1 100644 --- a/app/src/main/res/layout/fragment_create_project.xml +++ b/app/src/main/res/layout/fragment_create_project.xml @@ -274,6 +274,7 @@ app:layout_constraintTop_toBottomOf="@id/set_date_constraint_layout" android:background="@drawable/login_background" android:layout_marginTop="20dp" + android:paddingTop="10dp" android:textSize="15sp" android:fontFamily="@font/noto_sans_kr_regular" android:textColor="@color/black" @@ -282,7 +283,7 @@ android:layout_marginHorizontal="20dp" android:paddingHorizontal="14dp" android:lineSpacingExtra="4sp" - /> + android:includeFontPadding="false" /> + android:layout_marginLeft="15dp"/> - - - + + + + + + + + - - + + + + + + + + + + - - + + + + + + + + + android:paddingRight="10dp" + android:paddingLeft="12dp" + android:visibility="invisible"> + + + + + + diff --git a/app/src/main/res/layout/fragment_idea_list.xml b/app/src/main/res/layout/fragment_idea_list.xml index 2e9a085..cf3dd74 100644 --- a/app/src/main/res/layout/fragment_idea_list.xml +++ b/app/src/main/res/layout/fragment_idea_list.xml @@ -16,7 +16,7 @@ android:id="@+id/idea_list_title_view" android:layout_width="match_parent" android:layout_height="57dp" - android:background="@color/infra_blue_c" + android:background="@color/infra_blue_b" app:layout_constraintTop_toTopOf="parent" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintRight_toRightOf="parent"> diff --git a/app/src/main/res/layout/fragment_my_info_modify.xml b/app/src/main/res/layout/fragment_my_info_modify.xml index 1b74492..a0e9dcd 100644 --- a/app/src/main/res/layout/fragment_my_info_modify.xml +++ b/app/src/main/res/layout/fragment_my_info_modify.xml @@ -10,7 +10,7 @@ android:id="@+id/my_info_modify_title_view" android:layout_width="match_parent" android:layout_height="57dp" - android:background="@color/infra_blue_c" + android:background="@color/infra_blue_b" app:layout_constraintTop_toTopOf="parent" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintRight_toRightOf="parent"> diff --git a/app/src/main/res/layout/fragment_my_info_my_idea.xml b/app/src/main/res/layout/fragment_my_info_my_idea.xml index 73d385a..5eb5d34 100644 --- a/app/src/main/res/layout/fragment_my_info_my_idea.xml +++ b/app/src/main/res/layout/fragment_my_info_my_idea.xml @@ -9,7 +9,7 @@ android:id="@+id/my_idea_list_title_view" android:layout_width="match_parent" android:layout_height="57dp" - android:background="@color/infra_blue_c" + android:background="@color/infra_blue_b" app:layout_constraintTop_toTopOf="parent" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintRight_toRightOf="parent"/> diff --git a/app/src/main/res/layout/fragment_my_info_project_modify.xml b/app/src/main/res/layout/fragment_my_info_project_modify.xml index 2e53012..ffdcea1 100644 --- a/app/src/main/res/layout/fragment_my_info_project_modify.xml +++ b/app/src/main/res/layout/fragment_my_info_project_modify.xml @@ -1,10 +1,11 @@ - + app:layout_constraintBottom_toBottomOf="parent"> - + android:layout_height="0dp" + app:layout_constraintTop_toTopOf="parent" + app:layout_constraintLeft_toLeftOf="parent" + app:layout_constraintRight_toRightOf="parent" + app:layout_constraintBottom_toBottomOf="parent"> + android:layout_height="wrap_content"> + + + + app:layout_constraintTop_toTopOf="@id/category_team_idea_constraint_layout" /> + - + android:layout_marginLeft="4dp" + android:text=">" + android:textColor="@color/infra_gray_i" + android:textSize="14sp" + app:layout_constraintBottom_toBottomOf="@id/category_team_idea_category_textview" + app:layout_constraintLeft_toRightOf="@id/category_team_idea_category_textview" + app:layout_constraintTop_toTopOf="@id/category_team_idea_category_textview" /> + + + + + - + android:layout_marginEnd="32dp" + android:layout_marginTop="24dp"> + + + - - - + + + + + + + + - + - - - - - - - - - - - - - - + android:layout_height="wrap_content" + android:layout_marginTop="22dp" + android:layout_marginHorizontal="40dp" + android:orientation="vertical" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@id/category_team_idea_textview"> + + + - + + android:includeFontPadding="false" + android:text="제작 기간" + android:textColor="@color/black" + android:textSize="15sp" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@id/category_team_idea_idea_linearlayout" /> + android:includeFontPadding="false" + android:text="2022년 1월 25일 - 2022년 2월 15일" + android:textColor="@color/black" + android:textSize="15sp" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@id/category_team_idea_period_textview" + android:layout_marginTop="12dp" + android:layout_marginStart="40dp" /> + + + android:includeFontPadding="false" + android:text="진행 상황" + android:textColor="@color/black" + android:textSize="15sp" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@id/category_team_idea_period_text_textview" /> - + android:fontFamily="@font/noto_sans_kr_regular" + android:includeFontPadding="false" + android:text="보시다시피 포스터작업은 끝났습니다." + android:textColor="@color/black" + android:textSize="15sp" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@id/category_team_idea_progress_textview" + android:layout_marginTop="12dp" + android:layout_marginStart="40dp" /> - - + + android:layout_marginStart="36dp" + android:layout_marginTop="68dp" + android:fontFamily="@font/noto_sans_kr_medium" + android:includeFontPadding="false" + android:text="팀장" + android:textColor="@color/black" + android:textSize="15sp" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@id/category_team_idea_progress_text_textview" /> + + android:text="회의 러버" + android:textColor="@color/black" + android:textSize="15sp" + app:layout_constraintStart_toEndOf="@id/category_team_idea_leader_profile_iv" + app:layout_constraintTop_toTopOf="@id/category_team_idea_leader_profile_iv" + app:layout_constraintBottom_toBottomOf="@id/category_team_idea_leader_profile_iv" + android:layout_marginStart="16dp"/> - - + + + + + + + - + android:orientation="horizontal" + app:layout_constraintStart_toStartOf="parent" + android:layout_marginStart="40dp" + app:layout_constraintTop_toBottomOf="@id/hash_tag_team_idea" + android:layout_marginTop="26dp" + app:layout_constraintBottom_toBottomOf="parent" + android:layout_marginBottom="50dp"> + + + + + + + diff --git a/app/src/main/res/layout/my_info_my_project_delete_warning.xml b/app/src/main/res/layout/my_info_my_project_delete_warning.xml new file mode 100644 index 0000000..bca93e3 --- /dev/null +++ b/app/src/main/res/layout/my_info_my_project_delete_warning.xml @@ -0,0 +1,88 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/my_info_team_idea.xml b/app/src/main/res/layout/my_info_team_idea.xml index 0ad957d..6de0ccf 100644 --- a/app/src/main/res/layout/my_info_team_idea.xml +++ b/app/src/main/res/layout/my_info_team_idea.xml @@ -11,7 +11,7 @@ android:id="@+id/category_team_title_view" android:layout_width="match_parent" android:layout_height="57dp" - android:background="@color/infra_blue_c" + android:background="@color/infra_blue_b" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintRight_toRightOf="parent" app:layout_constraintTop_toTopOf="parent"/> @@ -31,9 +31,9 @@ app:layout_constraintTop_toTopOf="parent" /> + app:layout_constraintTop_toTopOf="@id/category_team_back_button" + app:layout_constraintRight_toLeftOf="@id/more_image_button"/> + + diff --git a/app/src/main/res/layout/my_info_team_member_evaluation.xml b/app/src/main/res/layout/my_info_team_member_evaluation.xml index 6b3b0f5..a387b8e 100644 --- a/app/src/main/res/layout/my_info_team_member_evaluation.xml +++ b/app/src/main/res/layout/my_info_team_member_evaluation.xml @@ -11,7 +11,7 @@ android:id="@+id/team_member_evaluation_title_view" android:layout_width="match_parent" android:layout_height="57dp" - android:background="@color/infra_blue_c" + android:background="@color/infra_blue_b" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintRight_toRightOf="parent" app:layout_constraintTop_toTopOf="parent"/> diff --git a/app/src/main/res/layout/my_project_more_menu.xml b/app/src/main/res/layout/my_project_more_menu.xml new file mode 100644 index 0000000..ae912e3 --- /dev/null +++ b/app/src/main/res/layout/my_project_more_menu.xml @@ -0,0 +1,94 @@ + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/navigation/nav_graph.xml b/app/src/main/res/navigation/nav_graph.xml index 19381b2..fcff7ca 100644 --- a/app/src/main/res/navigation/nav_graph.xml +++ b/app/src/main/res/navigation/nav_graph.xml @@ -31,6 +31,9 @@ + + + + \ No newline at end of file