diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index a6f749fc..001946af 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -3,7 +3,7 @@ xmlns:tools="http://schemas.android.com/tools"> - + + + @@ -27,6 +32,7 @@ + - \ No newline at end of file + diff --git a/app/src/main/java/com/sopetit/softie/ui/main/happy/HappyActivity.kt b/app/src/main/java/com/sopetit/softie/ui/main/happy/HappyActivity.kt new file mode 100644 index 00000000..a61e7746 --- /dev/null +++ b/app/src/main/java/com/sopetit/softie/ui/main/happy/HappyActivity.kt @@ -0,0 +1,23 @@ +package com.sopetit.softie.ui.main.happy + +import android.os.Bundle +import androidx.appcompat.app.AppCompatActivity +import com.sopetit.softie.R +import com.sopetit.softie.databinding.ActivityHappyBinding + +class HappyActivity : AppCompatActivity() { + private lateinit var binding: ActivityHappyBinding + + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + binding = ActivityHappyBinding.inflate(layoutInflater) + setContentView(binding.root) + + val currentFragment = supportFragmentManager.findFragmentById(R.id.fcv_happy) + if (currentFragment == null) { + supportFragmentManager.beginTransaction() + .add(R.id.fcv_happy, HappyEmptyFragment()) + .commit() + } + } +} diff --git a/app/src/main/java/com/sopetit/softie/ui/main/happy/HappyEmptyFragment.kt b/app/src/main/java/com/sopetit/softie/ui/main/happy/HappyEmptyFragment.kt new file mode 100644 index 00000000..d4666b9f --- /dev/null +++ b/app/src/main/java/com/sopetit/softie/ui/main/happy/HappyEmptyFragment.kt @@ -0,0 +1,23 @@ +package com.sopetit.softie.ui.main.happy + +import android.os.Bundle +import android.view.LayoutInflater +import android.view.View +import android.view.ViewGroup +import androidx.fragment.app.Fragment +import com.sopetit.softie.databinding.FragmentHappyEmptyBinding + +class HappyEmptyFragment : Fragment() { + private var _binding: FragmentHappyEmptyBinding? = null + private val binding: FragmentHappyEmptyBinding + get() = requireNotNull(_binding) { "바인딩 객체가 생성되지 않았습니다" } + + override fun onCreateView( + inflater: LayoutInflater, + container: ViewGroup?, + savedInstanceState: Bundle?, + ): View? { + _binding = FragmentHappyEmptyBinding.inflate(inflater, container, false) + return binding.root + } +} diff --git a/app/src/main/res/drawable/ic_back_arrow.xml b/app/src/main/res/drawable/ic_back_arrow.xml new file mode 100644 index 00000000..b02ce32f --- /dev/null +++ b/app/src/main/res/drawable/ic_back_arrow.xml @@ -0,0 +1,14 @@ + + + + diff --git a/app/src/main/res/drawable/ic_face_red.xml b/app/src/main/res/drawable/ic_face_red.xml new file mode 100644 index 00000000..c1ec7cef --- /dev/null +++ b/app/src/main/res/drawable/ic_face_red.xml @@ -0,0 +1,64 @@ + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/drawable/ic_happy_add.xml b/app/src/main/res/drawable/ic_happy_add.xml new file mode 100644 index 00000000..15b02a8b --- /dev/null +++ b/app/src/main/res/drawable/ic_happy_add.xml @@ -0,0 +1,18 @@ + + + + + + + diff --git a/app/src/main/res/drawable/ic_next.xml b/app/src/main/res/drawable/ic_next.xml new file mode 100644 index 00000000..d3bcff28 --- /dev/null +++ b/app/src/main/res/drawable/ic_next.xml @@ -0,0 +1,10 @@ + + + + diff --git a/app/src/main/res/drawable/ic_speech_long.xml b/app/src/main/res/drawable/ic_speech_long.xml new file mode 100644 index 00000000..fd712bb8 --- /dev/null +++ b/app/src/main/res/drawable/ic_speech_long.xml @@ -0,0 +1,18 @@ + + + + + + + diff --git a/app/src/main/res/drawable/rect_gray_gray_stroke_radius_20.xml b/app/src/main/res/drawable/rect_gray_gray_stroke_radius_20.xml new file mode 100644 index 00000000..7c7d5d97 --- /dev/null +++ b/app/src/main/res/drawable/rect_gray_gray_stroke_radius_20.xml @@ -0,0 +1,9 @@ + + + + + + diff --git a/app/src/main/res/layout/activity_happy.xml b/app/src/main/res/layout/activity_happy.xml new file mode 100644 index 00000000..593dadaa --- /dev/null +++ b/app/src/main/res/layout/activity_happy.xml @@ -0,0 +1,23 @@ + + + + + + + + + + + + + diff --git a/app/src/main/res/layout/fragment_happy_empty.xml b/app/src/main/res/layout/fragment_happy_empty.xml new file mode 100644 index 00000000..d4156d11 --- /dev/null +++ b/app/src/main/res/layout/fragment_happy_empty.xml @@ -0,0 +1,105 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 7adc19f3..024620e8 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -1,3 +1,8 @@ Softie - \ No newline at end of file + + + 행복루틴 + 행복 루틴은 매일 조금씩 너에 대해\n알아갈 수 있는 특별한 이벤트형 루틴이야! + 진행 중인 행복루틴이 없어요.\n루틴을 추가할까요? +