diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index a4000a8a..e7889053 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -32,6 +32,17 @@ android:exported="false" android:screenOrientation="portrait" /> + + + + + (R.layout.activity_sample) { + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + initFragment() + } + + private fun initFragment() { + val currentFragment = supportFragmentManager.findFragmentById(R.id.fcv_empty_fragment) + if (currentFragment == null) { + supportFragmentManager.beginTransaction() + .add(R.id.fcv_empty_fragment, DailyRoutineFragment()) + .commit() + } + } +} diff --git a/app/src/main/java/com/sopetit/softie/ui/dailyroutine/DailyRoutineFragment.kt b/app/src/main/java/com/sopetit/softie/ui/dailyroutine/DailyRoutineFragment.kt new file mode 100644 index 00000000..62d7b940 --- /dev/null +++ b/app/src/main/java/com/sopetit/softie/ui/dailyroutine/DailyRoutineFragment.kt @@ -0,0 +1,32 @@ +package com.sopetit.softie.ui.dailyroutine + +import android.content.Intent +import android.os.Bundle +import android.view.View +import androidx.fragment.app.viewModels +import com.sopetit.softie.R +import com.sopetit.softie.databinding.FragmentDailyRoutineBinding +import com.sopetit.softie.ui.dailyroutine.dailyroutineedit.DailyRoutineEditActivity +import com.sopetit.softie.util.binding.BindingFragment + +class DailyRoutineFragment : + BindingFragment(R.layout.fragment_daily_routine) { + + private val dailyRoutineViewModel by viewModels() + + override fun onViewCreated(view: View, savedInstanceState: Bundle?) { + super.onViewCreated(view, savedInstanceState) + + binding.lifecycleOwner = this + binding.dailyRoutineViewModel = dailyRoutineViewModel + + moveEdit() + } + + private fun moveEdit() { + binding.tvDailyRoutineEdit.setOnClickListener { + val intent = Intent(requireActivity(), DailyRoutineEditActivity::class.java) + startActivity(intent) + } + } +} diff --git a/app/src/main/java/com/sopetit/softie/ui/dailyroutine/DailyRoutineViewModel.kt b/app/src/main/java/com/sopetit/softie/ui/dailyroutine/DailyRoutineViewModel.kt new file mode 100644 index 00000000..9810cf72 --- /dev/null +++ b/app/src/main/java/com/sopetit/softie/ui/dailyroutine/DailyRoutineViewModel.kt @@ -0,0 +1,7 @@ +package com.sopetit.softie.ui.dailyroutine + +import androidx.lifecycle.ViewModel + +class DailyRoutineViewModel : ViewModel() { + val routineAddList = listOf(1, 2) +} diff --git a/app/src/main/java/com/sopetit/softie/ui/dailyroutine/dailyroutineedit/DailyRoutineEditActivity.kt b/app/src/main/java/com/sopetit/softie/ui/dailyroutine/dailyroutineedit/DailyRoutineEditActivity.kt new file mode 100644 index 00000000..677285f4 --- /dev/null +++ b/app/src/main/java/com/sopetit/softie/ui/dailyroutine/dailyroutineedit/DailyRoutineEditActivity.kt @@ -0,0 +1,46 @@ +package com.sopetit.softie.ui.dailyroutine.dailyroutineedit + +import android.content.Intent +import android.os.Bundle +import android.view.View +import androidx.activity.viewModels +import com.sopetit.softie.R +import com.sopetit.softie.databinding.ActivityDailyRoutineEditBinding +import com.sopetit.softie.ui.dailyroutine.DailyRoutineActivity +import com.sopetit.softie.util.binding.BindingActivity + +class DailyRoutineEditActivity : + BindingActivity(R.layout.activity_daily_routine_edit) { + private val dailyRoutineEditViewModel by viewModels() + + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + + binding.lifecycleOwner = this + binding.dailyRoutineEditViewModel = dailyRoutineEditViewModel + + moveDaily() + selectBtn() + } + + private fun moveDaily() { + binding.tvDailyRoutineEditCancel.setOnClickListener { + val intent = Intent(this, DailyRoutineActivity::class.java) + startActivity(intent) + } + } + + private fun selectBtn() { + with(binding) { + setButtonClickListener(btnDailyRoutineEditRadioEmptyFirst) + setButtonClickListener(btnDailyRoutineEditRadioEmptySecond) + setButtonClickListener(btnDailyRoutineEditRadioEmptyThird) + } + } + + private fun setButtonClickListener(button: View) { + button.setOnClickListener { + it.isSelected = !it.isSelected + } + } +} diff --git a/app/src/main/java/com/sopetit/softie/ui/dailyroutine/dailyroutineedit/DailyRoutineEditViewModel.kt b/app/src/main/java/com/sopetit/softie/ui/dailyroutine/dailyroutineedit/DailyRoutineEditViewModel.kt new file mode 100644 index 00000000..b8b943ec --- /dev/null +++ b/app/src/main/java/com/sopetit/softie/ui/dailyroutine/dailyroutineedit/DailyRoutineEditViewModel.kt @@ -0,0 +1,7 @@ +package com.sopetit.softie.ui.dailyroutine.dailyroutineedit + +import androidx.lifecycle.ViewModel + +class DailyRoutineEditViewModel : ViewModel() { + val routineAddList = listOf(1, 2) +} diff --git a/app/src/main/res/drawable/ic_daily.xml b/app/src/main/res/drawable/ic_daily.xml new file mode 100644 index 00000000..c54904b4 --- /dev/null +++ b/app/src/main/res/drawable/ic_daily.xml @@ -0,0 +1,13 @@ + + + + diff --git a/app/src/main/res/drawable/ic_daily_fin.xml b/app/src/main/res/drawable/ic_daily_fin.xml new file mode 100644 index 00000000..569c1145 --- /dev/null +++ b/app/src/main/res/drawable/ic_daily_fin.xml @@ -0,0 +1,13 @@ + + + + + + diff --git a/app/src/main/res/drawable/ic_daily_plus.xml b/app/src/main/res/drawable/ic_daily_plus.xml new file mode 100644 index 00000000..4561ceeb --- /dev/null +++ b/app/src/main/res/drawable/ic_daily_plus.xml @@ -0,0 +1,13 @@ + + + + + + diff --git a/app/src/main/res/drawable/ic_radio_click.xml b/app/src/main/res/drawable/ic_radio_click.xml new file mode 100644 index 00000000..b8338051 --- /dev/null +++ b/app/src/main/res/drawable/ic_radio_click.xml @@ -0,0 +1,14 @@ + + + + diff --git a/app/src/main/res/drawable/ic_radio_empty.xml b/app/src/main/res/drawable/ic_radio_empty.xml new file mode 100644 index 00000000..9bac9db0 --- /dev/null +++ b/app/src/main/res/drawable/ic_radio_empty.xml @@ -0,0 +1,11 @@ + + + diff --git a/app/src/main/res/drawable/selector_daily_edit.xml b/app/src/main/res/drawable/selector_daily_edit.xml new file mode 100644 index 00000000..8be7d81f --- /dev/null +++ b/app/src/main/res/drawable/selector_daily_edit.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/app/src/main/res/drawable/shape_gray100_fill_10_rect.xml b/app/src/main/res/drawable/shape_gray100_fill_10_rect.xml new file mode 100644 index 00000000..5a20fa5d --- /dev/null +++ b/app/src/main/res/drawable/shape_gray100_fill_10_rect.xml @@ -0,0 +1,8 @@ + + + + + + + diff --git a/app/src/main/res/drawable/shape_gray200_line_20_rect.xml b/app/src/main/res/drawable/shape_gray200_line_20_rect.xml new file mode 100644 index 00000000..ef57e5ff --- /dev/null +++ b/app/src/main/res/drawable/shape_gray200_line_20_rect.xml @@ -0,0 +1,12 @@ + + + + + + + diff --git a/app/src/main/res/drawable/shape_main1_fill_10_rect.xml b/app/src/main/res/drawable/shape_main1_fill_10_rect.xml new file mode 100644 index 00000000..89b48bd7 --- /dev/null +++ b/app/src/main/res/drawable/shape_main1_fill_10_rect.xml @@ -0,0 +1,8 @@ + + + + + + + diff --git a/app/src/main/res/drawable/shape_white_fill_gray100_stroke_20_rect.xml b/app/src/main/res/drawable/shape_white_fill_gray100_stroke_20_rect.xml new file mode 100644 index 00000000..75828ed1 --- /dev/null +++ b/app/src/main/res/drawable/shape_white_fill_gray100_stroke_20_rect.xml @@ -0,0 +1,10 @@ + + + + + + + + diff --git a/app/src/main/res/layout/activity_daily_routine_edit.xml b/app/src/main/res/layout/activity_daily_routine_edit.xml new file mode 100644 index 00000000..c7d9a384 --- /dev/null +++ b/app/src/main/res/layout/activity_daily_routine_edit.xml @@ -0,0 +1,414 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/layout/activity_sample.xml b/app/src/main/res/layout/activity_sample.xml new file mode 100644 index 00000000..c92cad96 --- /dev/null +++ b/app/src/main/res/layout/activity_sample.xml @@ -0,0 +1,24 @@ + + + + + + + + + + + + + diff --git a/app/src/main/res/layout/fragment_daily_routine.xml b/app/src/main/res/layout/fragment_daily_routine.xml new file mode 100644 index 00000000..9b2553f4 --- /dev/null +++ b/app/src/main/res/layout/fragment_daily_routine.xml @@ -0,0 +1,345 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index c0bba807..0083f044 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -3,7 +3,7 @@ 다 선택했어 하루의 시작 - 안녕 난 %s!\n나와 함께 루틴을 만들어볼까? + 안녕 난 애착이야!\n나와 함께 루틴을 만들어볼까? 관심 있는 테마 3개 선택해줘! 관심사를 바탕으로 목록을 추천해줄게.\n이 중에 데일리 루틴 3개를 선택해봐! 하루 한 번 엘레베이터 대신 계단 이용하기 @@ -59,4 +59,18 @@ 소프티 이 이름이 좋겠어 *특수문자는 사용할 수 없어요 + + + n개 삭제 + 데일리 루틴 + 취소 + 편집 + 0개 삭제 + + + 이불 개기 + n번째 달성 중 + 완료하기 + 달성완료 +