Skip to content
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

#57 [ui] 데일리루틴 추가하기 바텀시트 #60

Merged
merged 4 commits into from
Jan 16, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@ import android.content.Intent
import android.os.Bundle
import android.view.View
import android.widget.TextView
import androidx.activity.result.contract.ActivityResultContracts
import androidx.appcompat.app.AppCompatActivity
import androidx.fragment.app.viewModels
import com.sopetit.softie.R
import com.sopetit.softie.databinding.FragmentDailyRoutineBinding
Expand Down Expand Up @@ -32,6 +34,7 @@ class DailyRoutineFragment :
initSetDailyRoutineContent()
initSetDeleteView()
initSetRoutineDelete()
addDailyRoutineMsg()
}

private fun getBundle() {
Expand Down Expand Up @@ -188,6 +191,24 @@ class DailyRoutineFragment :
startActivity(intentToCompleteActivity)
}

private val addDailyRoutineLauncher =
registerForActivityResult(ActivityResultContracts.StartActivityForResult()) { result ->
if (result.resultCode == AppCompatActivity.RESULT_OK) {
snackBar(binding.root, getString(R.string.daily_routine_snack_bar))
}
}
Comment on lines +195 to +199
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

굿이에용


private fun addDailyRoutineMsg() {
binding.ivDailyRoutineEmpty.setOnClickListener {
addDailyRoutineLauncher.launch(
Intent(
requireActivity(),
DailyRoutineAddActivity::class.java
)
)
}
}

private fun moveToAddRoutine() {
binding.ivDailyRoutineEmpty.setOnClickListener {
val intent = Intent(requireContext(), DailyRoutineAddActivity::class.java)
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
package com.sopetit.softie.ui.dailyroutine.dailyroutineadd

import android.app.Activity
import android.content.Intent
import android.graphics.Rect
import android.os.Bundle
import android.view.View
Expand All @@ -11,7 +13,10 @@ import androidx.viewpager2.widget.ViewPager2
import com.sopetit.softie.R
import com.sopetit.softie.databinding.ActivityDailyRoutineAddBinding
import com.sopetit.softie.domain.entity.Theme
import com.sopetit.softie.ui.main.MainActivity
import com.sopetit.softie.util.OriginalBottomSheet
import com.sopetit.softie.util.binding.BindingActivity
import com.sopetit.softie.util.binding.BindingBottomSheet
import com.sopetit.softie.util.setStatusBarColorFromResource

class DailyRoutineAddActivity :
Expand All @@ -35,6 +40,7 @@ class DailyRoutineAddActivity :
setItemDiv()
initPagerDiv(0, 90)
addClickListener()
initSetDailyRoutineAdd()
}

private fun addClickListener() {
Expand Down Expand Up @@ -152,6 +158,35 @@ class DailyRoutineAddActivity :
}
}

private fun initSetDailyRoutineAdd() {
binding.btnDailyRoutineAdd.setOnClickListener {
// TODO 서버통신 구현 후 imageUri 버전으로 수정

BindingBottomSheet.Builder().build(
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

베이스가 워낙 잘 되어서 갖다쓰기 넘 편함

isDrawable = false,
imageDrawable = 0,
imageUri = "https://www.urbanbrush.net/web/wp-content/uploads/edd/2022/12/urbanbrush-20221214144619159434.jpg",
title = getString(R.string.daily_routine_add_question),
content = getString(R.string.daily_routine_content),
isContentVisible = true,
contentColor = R.color.gray400,
backBtnContent = getString(R.string.daily_routine_add_no),
doBtnContent = getString(R.string.daily_routine_add_yes),
doBtnColor = R.drawable.shape_main1_fill_12_rect,
backBtnAction = {},
doBtnAction = {
tossMsg()
}
).show(supportFragmentManager, OriginalBottomSheet.BOTTOM_SHEET_TAG)
}
}

private fun tossMsg() {
val resultIntent = Intent(this, MainActivity::class.java)
setResult(Activity.RESULT_OK, resultIntent)
finish()
}

companion object {
const val VIEW_PAGE = 3
const val PADDING_PAGE = 40
Expand Down
3 changes: 2 additions & 1 deletion app/src/main/java/com/sopetit/softie/ui/main/MainActivity.kt
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,10 @@ import dagger.hilt.android.AndroidEntryPoint

@AndroidEntryPoint
class MainActivity : BindingActivity<ActivityMainBinding>(R.layout.activity_main) {

override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
setStatusBarColorFromResource(R.color.home_background)
setStatusBarColorFromResource(R.color.background)

initFragment()
initBottomNavigation()
Expand Down
7 changes: 7 additions & 0 deletions app/src/main/res/values/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -114,4 +114,11 @@
<string name="home_happiness_cotton_btn">행복 솜뭉치 주기</string>
<string name="home_daily_cotton_btn">솜뭉치 주기</string>

<!-- daily routine add -->
<string name="daily_routine_add_question">데일리 루틴을 추가할까요?</string>
<string name="daily_routine_content">일어나면 5분 안에 이불개기</string>
<string name="daily_routine_add_no">아니, 더 고민할게</string>
<string name="daily_routine_add_yes">추가할래</string>
<string name="daily_routine_snack_bar">데일리 루틴을 1개 추가했어요</string>

</resources>