From 2f92371004412e44a57387f7dba8030986db47a9 Mon Sep 17 00:00:00 2001 From: pump9918 Date: Tue, 9 Jan 2024 12:40:25 +0900 Subject: [PATCH 01/12] =?UTF-8?q?#6=20[ui]=20drawable=20=EC=84=B8=ED=8C=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../rect_gray_gray_stroke_radius_20.xml | 8 ++++++ .../drawable/rect_gray_white_radius_20.xml | 6 +++++ app/src/main/res/drawable/svg_face_red.svg | 26 +++++++++++++++++++ app/src/main/res/drawable/svg_happy_add.svg | 11 ++++++++ app/src/main/res/drawable/svg_speech_long.svg | 7 +++++ 5 files changed, 58 insertions(+) create mode 100644 app/src/main/res/drawable/rect_gray_gray_stroke_radius_20.xml create mode 100644 app/src/main/res/drawable/rect_gray_white_radius_20.xml create mode 100644 app/src/main/res/drawable/svg_face_red.svg create mode 100644 app/src/main/res/drawable/svg_happy_add.svg create mode 100644 app/src/main/res/drawable/svg_speech_long.svg 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..f3f1b729 --- /dev/null +++ b/app/src/main/res/drawable/rect_gray_gray_stroke_radius_20.xml @@ -0,0 +1,8 @@ + + + + + diff --git a/app/src/main/res/drawable/rect_gray_white_radius_20.xml b/app/src/main/res/drawable/rect_gray_white_radius_20.xml new file mode 100644 index 00000000..d9c95435 --- /dev/null +++ b/app/src/main/res/drawable/rect_gray_white_radius_20.xml @@ -0,0 +1,6 @@ + + + + + diff --git a/app/src/main/res/drawable/svg_face_red.svg b/app/src/main/res/drawable/svg_face_red.svg new file mode 100644 index 00000000..3deef103 --- /dev/null +++ b/app/src/main/res/drawable/svg_face_red.svg @@ -0,0 +1,26 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/drawable/svg_happy_add.svg b/app/src/main/res/drawable/svg_happy_add.svg new file mode 100644 index 00000000..6ab2d1d9 --- /dev/null +++ b/app/src/main/res/drawable/svg_happy_add.svg @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/app/src/main/res/drawable/svg_speech_long.svg b/app/src/main/res/drawable/svg_speech_long.svg new file mode 100644 index 00000000..fb6c5211 --- /dev/null +++ b/app/src/main/res/drawable/svg_speech_long.svg @@ -0,0 +1,7 @@ + + + + + + + From f7b6e8de54374aeb7d5a5f6e5463650a932c467b Mon Sep 17 00:00:00 2001 From: pump9918 Date: Tue, 9 Jan 2024 13:16:21 +0900 Subject: [PATCH 02/12] =?UTF-8?q?#6=20[fix]=20vector=20=EC=9D=B4=EB=AF=B8?= =?UTF-8?q?=EC=A7=80=20xml=20=EB=B3=80=ED=99=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/main/res/drawable/svg_face_red.svg | 26 -------- app/src/main/res/drawable/svg_face_red.xml | 64 +++++++++++++++++++ app/src/main/res/drawable/svg_happy_add.svg | 11 ---- app/src/main/res/drawable/svg_happy_add.xml | 18 ++++++ app/src/main/res/drawable/svg_speech_long.svg | 7 -- app/src/main/res/drawable/svg_speech_long.xml | 18 ++++++ 6 files changed, 100 insertions(+), 44 deletions(-) delete mode 100644 app/src/main/res/drawable/svg_face_red.svg create mode 100644 app/src/main/res/drawable/svg_face_red.xml delete mode 100644 app/src/main/res/drawable/svg_happy_add.svg create mode 100644 app/src/main/res/drawable/svg_happy_add.xml delete mode 100644 app/src/main/res/drawable/svg_speech_long.svg create mode 100644 app/src/main/res/drawable/svg_speech_long.xml diff --git a/app/src/main/res/drawable/svg_face_red.svg b/app/src/main/res/drawable/svg_face_red.svg deleted file mode 100644 index 3deef103..00000000 --- a/app/src/main/res/drawable/svg_face_red.svg +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/app/src/main/res/drawable/svg_face_red.xml b/app/src/main/res/drawable/svg_face_red.xml new file mode 100644 index 00000000..c1ec7cef --- /dev/null +++ b/app/src/main/res/drawable/svg_face_red.xml @@ -0,0 +1,64 @@ + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/drawable/svg_happy_add.svg b/app/src/main/res/drawable/svg_happy_add.svg deleted file mode 100644 index 6ab2d1d9..00000000 --- a/app/src/main/res/drawable/svg_happy_add.svg +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - diff --git a/app/src/main/res/drawable/svg_happy_add.xml b/app/src/main/res/drawable/svg_happy_add.xml new file mode 100644 index 00000000..15b02a8b --- /dev/null +++ b/app/src/main/res/drawable/svg_happy_add.xml @@ -0,0 +1,18 @@ + + + + + + + diff --git a/app/src/main/res/drawable/svg_speech_long.svg b/app/src/main/res/drawable/svg_speech_long.svg deleted file mode 100644 index fb6c5211..00000000 --- a/app/src/main/res/drawable/svg_speech_long.svg +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/app/src/main/res/drawable/svg_speech_long.xml b/app/src/main/res/drawable/svg_speech_long.xml new file mode 100644 index 00000000..fd712bb8 --- /dev/null +++ b/app/src/main/res/drawable/svg_speech_long.xml @@ -0,0 +1,18 @@ + + + + + + + From 3d355a93e30eed136020c6a5942464e7e6e13309 Mon Sep 17 00:00:00 2001 From: pump9918 Date: Tue, 9 Jan 2024 14:19:31 +0900 Subject: [PATCH 03/12] =?UTF-8?q?#6=20[delete]=20=EB=B6=88=ED=95=84?= =?UTF-8?q?=EC=9A=94=ED=95=9C=20radius=20=EC=BD=94=EB=93=9C=20=EC=82=AD?= =?UTF-8?q?=EC=A0=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/main/res/drawable/rect_gray_white_radius_20.xml | 6 ------ 1 file changed, 6 deletions(-) delete mode 100644 app/src/main/res/drawable/rect_gray_white_radius_20.xml diff --git a/app/src/main/res/drawable/rect_gray_white_radius_20.xml b/app/src/main/res/drawable/rect_gray_white_radius_20.xml deleted file mode 100644 index d9c95435..00000000 --- a/app/src/main/res/drawable/rect_gray_white_radius_20.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - From 6fc8bbe71305c847c95585cf3b532cfae6caba44 Mon Sep 17 00:00:00 2001 From: pump9918 Date: Tue, 9 Jan 2024 14:19:54 +0900 Subject: [PATCH 04/12] =?UTF-8?q?#6=20[ui]=20=ED=96=89=EB=B3=B5=EB=A3=A8?= =?UTF-8?q?=ED=8B=B4=20empty=20view=20xml?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../rect_gray_gray_stroke_radius_20.xml | 1 + .../main/res/layout/fragment_happy_empty.xml | 99 +++++++++++++++++++ app/src/main/res/values/strings.xml | 7 +- 3 files changed, 106 insertions(+), 1 deletion(-) create mode 100644 app/src/main/res/layout/fragment_happy_empty.xml 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 index f3f1b729..7c7d5d97 100644 --- 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 @@ -4,5 +4,6 @@ + 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..8ddc4cd0 --- /dev/null +++ b/app/src/main/res/layout/fragment_happy_empty.xml @@ -0,0 +1,99 @@ + + + + + + + + + + + + + + + + + + + + + + + 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루틴을 추가할까요? + From 23d789e94b0a639cd953649bcafa4a3503c4d839 Mon Sep 17 00:00:00 2001 From: pump9918 Date: Tue, 9 Jan 2024 16:20:12 +0900 Subject: [PATCH 05/12] =?UTF-8?q?#6=20[fix]=20onclick=20CI=20=EC=B6=A9?= =?UTF-8?q?=EB=8F=8C=20=ED=95=B4=EA=B2=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/main/res/layout/fragment_happy_empty.xml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/app/src/main/res/layout/fragment_happy_empty.xml b/app/src/main/res/layout/fragment_happy_empty.xml index 8ddc4cd0..c4d7e0df 100644 --- a/app/src/main/res/layout/fragment_happy_empty.xml +++ b/app/src/main/res/layout/fragment_happy_empty.xml @@ -57,8 +57,7 @@ android:layout_marginBottom="200dp" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toBottomOf="@id/iv_happy_default_mention" - android:onClick="onRelativeLayoutClick"> + app:layout_constraintTop_toBottomOf="@id/iv_happy_default_mention"> Date: Tue, 9 Jan 2024 16:39:56 +0900 Subject: [PATCH 06/12] =?UTF-8?q?#6=20[fix]=20drawable=20=EC=9D=B4?= =?UTF-8?q?=EB=AF=B8=EC=A7=80=20=EC=BB=A8=EB=B2=A4=EC=85=98=20=ED=86=B5?= =?UTF-8?q?=EC=9D=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/main/res/drawable/{svg_face_red.xml => img_face_red.xml} | 0 .../main/res/drawable/{svg_happy_add.xml => img_happy_add.xml} | 0 .../res/drawable/{svg_speech_long.xml => img_speech_long.xml} | 0 3 files changed, 0 insertions(+), 0 deletions(-) rename app/src/main/res/drawable/{svg_face_red.xml => img_face_red.xml} (100%) rename app/src/main/res/drawable/{svg_happy_add.xml => img_happy_add.xml} (100%) rename app/src/main/res/drawable/{svg_speech_long.xml => img_speech_long.xml} (100%) diff --git a/app/src/main/res/drawable/svg_face_red.xml b/app/src/main/res/drawable/img_face_red.xml similarity index 100% rename from app/src/main/res/drawable/svg_face_red.xml rename to app/src/main/res/drawable/img_face_red.xml diff --git a/app/src/main/res/drawable/svg_happy_add.xml b/app/src/main/res/drawable/img_happy_add.xml similarity index 100% rename from app/src/main/res/drawable/svg_happy_add.xml rename to app/src/main/res/drawable/img_happy_add.xml diff --git a/app/src/main/res/drawable/svg_speech_long.xml b/app/src/main/res/drawable/img_speech_long.xml similarity index 100% rename from app/src/main/res/drawable/svg_speech_long.xml rename to app/src/main/res/drawable/img_speech_long.xml From 0f014d4039ca9a45badf165dbfcdd99a77c9769d Mon Sep 17 00:00:00 2001 From: pump9918 Date: Tue, 9 Jan 2024 16:40:27 +0900 Subject: [PATCH 07/12] =?UTF-8?q?#6=20[fix]=20xml=20id=20=EC=BB=A8?= =?UTF-8?q?=EB=B2=A4=EC=85=98=20=ED=86=B5=EC=9D=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/res/layout/fragment_happy_empty.xml | 30 +++++++++---------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/app/src/main/res/layout/fragment_happy_empty.xml b/app/src/main/res/layout/fragment_happy_empty.xml index c4d7e0df..c2d8afa2 100644 --- a/app/src/main/res/layout/fragment_happy_empty.xml +++ b/app/src/main/res/layout/fragment_happy_empty.xml @@ -21,16 +21,16 @@ android:layout_height="50dp" android:layout_marginStart="22dp" android:layout_marginTop="28dp" - android:src="@drawable/svg_face_red" + android:src="@drawable/img_face_red" app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toBottomOf="@+id/tv_happy_title" /> + app:layout_constraintTop_toBottomOf="@id/tv_happy_title" /> @@ -42,10 +42,10 @@ android:layout_height="wrap_content" android:gravity="center" android:text="@string/happy_default_mention" - app:layout_constraintBottom_toBottomOf="@+id/iv_happy_default_mention" - app:layout_constraintEnd_toEndOf="@+id/iv_happy_default_mention" - app:layout_constraintStart_toStartOf="@+id/iv_happy_default_mention" - app:layout_constraintTop_toTopOf="@+id/iv_happy_default_mention" /> + app:layout_constraintBottom_toBottomOf="@id/iv_happy_default_mention" + app:layout_constraintEnd_toEndOf="@id/iv_happy_default_mention" + app:layout_constraintStart_toStartOf="@id/iv_happy_default_mention" + app:layout_constraintTop_toTopOf="@id/iv_happy_default_mention" /> + app:layout_constraintEnd_toEndOf="@id/iv_happy_empty_card" + app:layout_constraintStart_toStartOf="@id/iv_happy_empty_card" + app:layout_constraintTop_toTopOf="@id/iv_happy_empty_card" + app:layout_constraintBottom_toTopOf="@id/iv_happy_empty_card_bear" /> + android:src="@drawable/img_happy_add" + app:layout_constraintEnd_toEndOf="@id/iv_happy_empty_card" + app:layout_constraintStart_toStartOf="@id/iv_happy_empty_card" + app:layout_constraintTop_toBottomOf="@id/tv_happy_empty_card" /> From e1d63ae24e40d36430994dbdbca8554544e852ed Mon Sep 17 00:00:00 2001 From: pump9918 Date: Tue, 9 Jan 2024 16:46:33 +0900 Subject: [PATCH 08/12] =?UTF-8?q?#6=20[fix]=20=EC=BB=A8=EB=B2=A4=EC=85=98,?= =?UTF-8?q?=20margin=20size=20=EC=98=A4=EB=A5=98=20=ED=95=B4=EA=B2=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/res/layout/fragment_happy_empty.xml | 165 +++++++++--------- 1 file changed, 86 insertions(+), 79 deletions(-) diff --git a/app/src/main/res/layout/fragment_happy_empty.xml b/app/src/main/res/layout/fragment_happy_empty.xml index c2d8afa2..00dcd5c3 100644 --- a/app/src/main/res/layout/fragment_happy_empty.xml +++ b/app/src/main/res/layout/fragment_happy_empty.xml @@ -1,98 +1,105 @@ - + - + - - - - - + + android:layout_width="match_parent" + android:layout_height="match_parent"> - + + + + + android:text="@string/happy_default_mention" + app:layout_constraintBottom_toBottomOf="@id/iv_happy_default_mention" + app:layout_constraintEnd_toEndOf="@id/iv_happy_default_mention" + app:layout_constraintStart_toStartOf="@id/iv_happy_default_mention" + app:layout_constraintTop_toTopOf="@id/iv_happy_default_mention" /> - + android:layout_marginStart="40dp" + android:layout_marginTop="53dp" + android:layout_marginEnd="40dp" + android:layout_marginBottom="200dp" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@id/iv_happy_default_mention"> - + + + + + + - + + + From a3e82e86f797619f38af689c4578a8c80c2b3d16 Mon Sep 17 00:00:00 2001 From: pump9918 Date: Tue, 9 Jan 2024 17:15:11 +0900 Subject: [PATCH 09/12] =?UTF-8?q?#6=20[fix]=20=EC=95=84=EC=9D=B4=EC=BD=98?= =?UTF-8?q?=20=EC=BB=A8=EB=B2=A4=EC=85=98=20ic=20=ED=86=B5=EC=9D=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/main/res/drawable/ic_back_arrow.xml | 14 ++++++++++++++ .../drawable/{img_face_red.xml => ic_face_red.xml} | 0 .../{img_happy_add.xml => ic_happy_add.xml} | 0 app/src/main/res/drawable/ic_next.xml | 10 ++++++++++ .../{img_speech_long.xml => ic_speech_long.xml} | 0 5 files changed, 24 insertions(+) create mode 100644 app/src/main/res/drawable/ic_back_arrow.xml rename app/src/main/res/drawable/{img_face_red.xml => ic_face_red.xml} (100%) rename app/src/main/res/drawable/{img_happy_add.xml => ic_happy_add.xml} (100%) create mode 100644 app/src/main/res/drawable/ic_next.xml rename app/src/main/res/drawable/{img_speech_long.xml => ic_speech_long.xml} (100%) 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/img_face_red.xml b/app/src/main/res/drawable/ic_face_red.xml similarity index 100% rename from app/src/main/res/drawable/img_face_red.xml rename to app/src/main/res/drawable/ic_face_red.xml diff --git a/app/src/main/res/drawable/img_happy_add.xml b/app/src/main/res/drawable/ic_happy_add.xml similarity index 100% rename from app/src/main/res/drawable/img_happy_add.xml rename to app/src/main/res/drawable/ic_happy_add.xml 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/img_speech_long.xml b/app/src/main/res/drawable/ic_speech_long.xml similarity index 100% rename from app/src/main/res/drawable/img_speech_long.xml rename to app/src/main/res/drawable/ic_speech_long.xml From a9946720bbf8aa665d85e398e95057e05e781992 Mon Sep 17 00:00:00 2001 From: pump9918 Date: Tue, 9 Jan 2024 17:16:21 +0900 Subject: [PATCH 10/12] =?UTF-8?q?#6=20[ui]=20Empty=20View=20Fragment=20?= =?UTF-8?q?=EC=84=B8=ED=8C=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/main/AndroidManifest.xml | 10 +++++-- .../sopetit/softie/ui/main/MainActivity.kt | 2 ++ .../softie/ui/main/happy/HappyActivity.kt | 23 +++++++++++++++ .../ui/main/happy/HappyEmptyFragment.kt | 23 +++++++++++++++ app/src/main/res/layout/activity_happy.xml | 23 +++++++++++++++ .../res/layout/activity_happy_add_list.xml | 29 +++++++++++++++++++ .../main/res/layout/fragment_happy_empty.xml | 6 ++-- 7 files changed, 111 insertions(+), 5 deletions(-) create mode 100644 app/src/main/java/com/sopetit/softie/ui/main/happy/HappyActivity.kt create mode 100644 app/src/main/java/com/sopetit/softie/ui/main/happy/HappyEmptyFragment.kt create mode 100644 app/src/main/res/layout/activity_happy.xml create mode 100644 app/src/main/res/layout/activity_happy_add_list.xml 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/MainActivity.kt b/app/src/main/java/com/sopetit/softie/ui/main/MainActivity.kt index bd2659c6..2d05987c 100644 --- a/app/src/main/java/com/sopetit/softie/ui/main/MainActivity.kt +++ b/app/src/main/java/com/sopetit/softie/ui/main/MainActivity.kt @@ -11,4 +11,6 @@ class MainActivity : BindingActivity(R.layout.activity_main override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) } + + } 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/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/activity_happy_add_list.xml b/app/src/main/res/layout/activity_happy_add_list.xml new file mode 100644 index 00000000..00f4f27a --- /dev/null +++ b/app/src/main/res/layout/activity_happy_add_list.xml @@ -0,0 +1,29 @@ + + + + + + + + + + + + + + + diff --git a/app/src/main/res/layout/fragment_happy_empty.xml b/app/src/main/res/layout/fragment_happy_empty.xml index 00dcd5c3..d4156d11 100644 --- a/app/src/main/res/layout/fragment_happy_empty.xml +++ b/app/src/main/res/layout/fragment_happy_empty.xml @@ -27,7 +27,7 @@ android:layout_height="50dp" android:layout_marginStart="22dp" android:layout_marginTop="28dp" - android:src="@drawable/img_face_red" + android:src="@drawable/ic_face_red" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/tv_happy_title" /> @@ -36,7 +36,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginStart="14dp" - android:src="@drawable/img_speech_long" + android:src="@drawable/ic_speech_long" app:layout_constraintBottom_toBottomOf="@id/iv_happy_character" app:layout_constraintStart_toEndOf="@id/iv_happy_character" app:layout_constraintTop_toTopOf="@id/iv_happy_character" /> @@ -93,7 +93,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="62dp" - android:src="@drawable/img_happy_add" + android:src="@drawable/ic_happy_add" app:layout_constraintEnd_toEndOf="@id/iv_happy_empty_card" app:layout_constraintStart_toStartOf="@id/iv_happy_empty_card" app:layout_constraintTop_toBottomOf="@id/tv_happy_empty_card" /> From 45d995c9a761b2dc856289184f34336f6311ab9a Mon Sep 17 00:00:00 2001 From: pump9918 Date: Tue, 9 Jan 2024 17:23:07 +0900 Subject: [PATCH 11/12] =?UTF-8?q?#6=20[ui]=20CI=20=EC=98=A4=EB=A5=98=20?= =?UTF-8?q?=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/main/java/com/sopetit/softie/ui/main/MainActivity.kt | 2 -- 1 file changed, 2 deletions(-) diff --git a/app/src/main/java/com/sopetit/softie/ui/main/MainActivity.kt b/app/src/main/java/com/sopetit/softie/ui/main/MainActivity.kt index 2d05987c..bd2659c6 100644 --- a/app/src/main/java/com/sopetit/softie/ui/main/MainActivity.kt +++ b/app/src/main/java/com/sopetit/softie/ui/main/MainActivity.kt @@ -11,6 +11,4 @@ class MainActivity : BindingActivity(R.layout.activity_main override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) } - - } From 7b1630830121315617ac508efc1c4aabad680486 Mon Sep 17 00:00:00 2001 From: pump9918 Date: Tue, 9 Jan 2024 17:26:54 +0900 Subject: [PATCH 12/12] =?UTF-8?q?#6=20[ui]=20CI=20=EB=AF=B8=EC=99=84?= =?UTF-8?q?=EC=84=B1=20xml=20=EC=98=A4=EB=A5=98=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../res/layout/activity_happy_add_list.xml | 29 ------------------- 1 file changed, 29 deletions(-) delete mode 100644 app/src/main/res/layout/activity_happy_add_list.xml diff --git a/app/src/main/res/layout/activity_happy_add_list.xml b/app/src/main/res/layout/activity_happy_add_list.xml deleted file mode 100644 index 00f4f27a..00000000 --- a/app/src/main/res/layout/activity_happy_add_list.xml +++ /dev/null @@ -1,29 +0,0 @@ - - - - - - - - - - - - - - -