From b586eb1db5c6b7fed73fadc07c864bfa0d13a199 Mon Sep 17 00:00:00 2001
From: Hailey <91793891+stellar-halo@users.noreply.github.com>
Date: Fri, 12 Jan 2024 01:34:43 +0900
Subject: [PATCH 01/26] =?UTF-8?q?#36=20[chore]=20icon=20=ED=8C=8C=EC=9D=BC?=
=?UTF-8?q?=20=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
app/src/main/res/drawable/ic_home_money.xml | 14 +++++++++++
.../main/res/drawable/ic_home_settings.xml | 9 +++++++
app/src/main/res/drawable/ic_logo_home.xml | 24 +++++++++++++++++++
app/src/main/res/drawable/ic_som_color.xml | 22 +++++++++++++++++
app/src/main/res/drawable/ic_som_white.xml | 12 ++++++++++
app/src/main/res/drawable/ic_speech_home.xml | 18 ++++++++++++++
6 files changed, 99 insertions(+)
create mode 100644 app/src/main/res/drawable/ic_home_money.xml
create mode 100644 app/src/main/res/drawable/ic_home_settings.xml
create mode 100644 app/src/main/res/drawable/ic_logo_home.xml
create mode 100644 app/src/main/res/drawable/ic_som_color.xml
create mode 100644 app/src/main/res/drawable/ic_som_white.xml
create mode 100644 app/src/main/res/drawable/ic_speech_home.xml
diff --git a/app/src/main/res/drawable/ic_home_money.xml b/app/src/main/res/drawable/ic_home_money.xml
new file mode 100644
index 00000000..d80ecada
--- /dev/null
+++ b/app/src/main/res/drawable/ic_home_money.xml
@@ -0,0 +1,14 @@
+
+
+
+
+
+
diff --git a/app/src/main/res/drawable/ic_home_settings.xml b/app/src/main/res/drawable/ic_home_settings.xml
new file mode 100644
index 00000000..4a177775
--- /dev/null
+++ b/app/src/main/res/drawable/ic_home_settings.xml
@@ -0,0 +1,9 @@
+
+
+
diff --git a/app/src/main/res/drawable/ic_logo_home.xml b/app/src/main/res/drawable/ic_logo_home.xml
new file mode 100644
index 00000000..fe5eb75f
--- /dev/null
+++ b/app/src/main/res/drawable/ic_logo_home.xml
@@ -0,0 +1,24 @@
+
+
+
+
+
+
+
+
diff --git a/app/src/main/res/drawable/ic_som_color.xml b/app/src/main/res/drawable/ic_som_color.xml
new file mode 100644
index 00000000..78bf375b
--- /dev/null
+++ b/app/src/main/res/drawable/ic_som_color.xml
@@ -0,0 +1,22 @@
+
+
+
+
+
+
+
diff --git a/app/src/main/res/drawable/ic_som_white.xml b/app/src/main/res/drawable/ic_som_white.xml
new file mode 100644
index 00000000..5b54205f
--- /dev/null
+++ b/app/src/main/res/drawable/ic_som_white.xml
@@ -0,0 +1,12 @@
+
+
+
diff --git a/app/src/main/res/drawable/ic_speech_home.xml b/app/src/main/res/drawable/ic_speech_home.xml
new file mode 100644
index 00000000..bfca24ac
--- /dev/null
+++ b/app/src/main/res/drawable/ic_speech_home.xml
@@ -0,0 +1,18 @@
+
+
+
+
+
+
+
From 5dcfa05aef07e83ff9a301e38224315ad0dd3794 Mon Sep 17 00:00:00 2001
From: Hailey <91793891+stellar-halo@users.noreply.github.com>
Date: Fri, 12 Jan 2024 01:35:07 +0900
Subject: [PATCH 02/26] =?UTF-8?q?#36=20[add]=20shape=20drawble=20=EC=B6=94?=
=?UTF-8?q?=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../main/res/drawable/shape_gray000_fill_16_rect.xml | 7 +++++++
.../shape_namefill_fill_namestroke_stroke_99_rect.xml | 10 ++++++++++
2 files changed, 17 insertions(+)
create mode 100644 app/src/main/res/drawable/shape_gray000_fill_16_rect.xml
create mode 100644 app/src/main/res/drawable/shape_namefill_fill_namestroke_stroke_99_rect.xml
diff --git a/app/src/main/res/drawable/shape_gray000_fill_16_rect.xml b/app/src/main/res/drawable/shape_gray000_fill_16_rect.xml
new file mode 100644
index 00000000..8bf9cc5e
--- /dev/null
+++ b/app/src/main/res/drawable/shape_gray000_fill_16_rect.xml
@@ -0,0 +1,7 @@
+
+
+
+
+
+
diff --git a/app/src/main/res/drawable/shape_namefill_fill_namestroke_stroke_99_rect.xml b/app/src/main/res/drawable/shape_namefill_fill_namestroke_stroke_99_rect.xml
new file mode 100644
index 00000000..06ba3f70
--- /dev/null
+++ b/app/src/main/res/drawable/shape_namefill_fill_namestroke_stroke_99_rect.xml
@@ -0,0 +1,10 @@
+
+
+
+
+
+
+
From 65619ee4b42250f4d78daa672ba30a7146a611c2 Mon Sep 17 00:00:00 2001
From: Hailey <91793891+stellar-halo@users.noreply.github.com>
Date: Fri, 12 Jan 2024 01:35:30 +0900
Subject: [PATCH 03/26] =?UTF-8?q?#36=20[fix]=20status=20=ED=88=AC=EB=AA=85?=
=?UTF-8?q?=ED=95=98=EA=B2=8C=20=ED=95=98=EB=8A=94=20=EC=86=8D=EC=84=B1=20?=
=?UTF-8?q?=EC=82=AD=EC=A0=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
app/src/main/res/values/themes.xml | 3 ---
1 file changed, 3 deletions(-)
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index 5f6c72cf..4e302e33 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -4,9 +4,6 @@
- false
- true
- - true
- - @android:color/transparent
- - true
From eceb08c8ae8c79538404119bb82400a06d07d7b0 Mon Sep 17 00:00:00 2001
From: Hailey <91793891+stellar-halo@users.noreply.github.com>
Date: Fri, 12 Jan 2024 01:36:09 +0900
Subject: [PATCH 04/26] =?UTF-8?q?#36=20[fix]=20status,=20=ED=95=98?=
=?UTF-8?q?=EB=8B=A8=20=EB=84=A4=EB=B9=84=EB=A5=BC=20=ED=88=AC=EB=AA=85?=
=?UTF-8?q?=ED=95=98=EA=B2=8C=20=ED=95=B4=EC=84=9C=20LIMIT=EC=9D=84=20?=
=?UTF-8?q?=EB=B0=9B=EC=A7=80=20=EC=95=8A=EB=8A=94=20=EB=A1=9C=EC=A7=81=20?=
=?UTF-8?q?=EC=82=AD=EC=A0=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../com/sopetit/softie/SoftieApplication.kt | 41 -------------------
1 file changed, 41 deletions(-)
diff --git a/app/src/main/java/com/sopetit/softie/SoftieApplication.kt b/app/src/main/java/com/sopetit/softie/SoftieApplication.kt
index 3d881cb1..bc5acb18 100644
--- a/app/src/main/java/com/sopetit/softie/SoftieApplication.kt
+++ b/app/src/main/java/com/sopetit/softie/SoftieApplication.kt
@@ -1,10 +1,6 @@
package com.sopetit.softie
-import android.app.Activity
import android.app.Application
-import android.os.Bundle
-import android.view.Window
-import android.view.WindowManager
import androidx.appcompat.app.AppCompatDelegate
import dagger.hilt.android.HiltAndroidApp
import timber.log.Timber
@@ -16,42 +12,5 @@ class SoftieApplication : Application() {
if (BuildConfig.DEBUG) Timber.plant(Timber.DebugTree())
AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_NO)
- setStatusBarTransparent()
- }
-
- private fun setStatusBarTransparent() {
- registerActivityLifecycleCallbacks(object : ActivityLifecycleCallbacks {
- override fun onActivityCreated(activity: Activity, savedInstanceState: Bundle?) {
- applyWindowFlags(activity.window)
- }
-
- override fun onActivityStarted(activity: Activity) { // TODO("Not yet implemented")
- }
-
- override fun onActivityResumed(activity: Activity) { // TODO("Not yet implemented")
- }
-
- override fun onActivityPaused(activity: Activity) { // TODO("Not yet implemented")
- }
-
- override fun onActivityStopped(activity: Activity) { // TODO("Not yet implemented")
- }
-
- override fun onActivitySaveInstanceState(
- activity: Activity,
- outState: Bundle
- ) { // TODO("Not yet implemented")
- }
-
- override fun onActivityDestroyed(activity: Activity) { // TODO("Not yet implemented")
- }
- })
- }
-
- private fun applyWindowFlags(window: Window) {
- window.setFlags(
- WindowManager.LayoutParams.FLAG_LAYOUT_NO_LIMITS,
- WindowManager.LayoutParams.FLAG_LAYOUT_NO_LIMITS
- )
}
}
From 81eda1abd586a73a95f12fc4ea4015160af6a399 Mon Sep 17 00:00:00 2001
From: Hailey <91793891+stellar-halo@users.noreply.github.com>
Date: Fri, 12 Jan 2024 01:36:59 +0900
Subject: [PATCH 05/26] =?UTF-8?q?#36=20[fix]=20status=20=ED=99=95=EC=9E=A5?=
=?UTF-8?q?=20=ED=95=A8=EC=88=98=20=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../main/java/com/sopetit/softie/util/Context.kt | 16 +++++++++++++++-
1 file changed, 15 insertions(+), 1 deletion(-)
diff --git a/app/src/main/java/com/sopetit/softie/util/Context.kt b/app/src/main/java/com/sopetit/softie/util/Context.kt
index bd171a04..26c28e88 100644
--- a/app/src/main/java/com/sopetit/softie/util/Context.kt
+++ b/app/src/main/java/com/sopetit/softie/util/Context.kt
@@ -5,6 +5,8 @@ import android.content.Context
import android.view.View
import android.view.inputmethod.InputMethodManager
import android.widget.Toast
+import androidx.core.content.ContextCompat
+import androidx.fragment.app.Fragment
import com.google.android.material.snackbar.Snackbar
fun Context.hideKeyboard(view: View) {
@@ -14,7 +16,7 @@ fun Context.hideKeyboard(view: View) {
fun snackBar(
anchorView: View,
- message: String,
+ message: String
) {
Snackbar.make(anchorView, message, Snackbar.LENGTH_SHORT).show()
}
@@ -22,3 +24,15 @@ fun snackBar(
fun Context.toast(message: String) {
Toast.makeText(this, message, Toast.LENGTH_SHORT).show()
}
+
+fun Fragment.setStatusBarColor(colorResId: Int) {
+ activity?.let {
+ val statusBarColor = ContextCompat.getColor(it, colorResId)
+ it.window.statusBarColor = statusBarColor
+ }
+}
+
+fun Activity.setStatusBarColorFromResource(colorResId: Int) {
+ val statusBarColor = ContextCompat.getColor(this, colorResId)
+ window.statusBarColor = statusBarColor
+}
From 36047e9897a61ced202f9f191e93aea6538d359c Mon Sep 17 00:00:00 2001
From: Hailey <91793891+stellar-halo@users.noreply.github.com>
Date: Fri, 12 Jan 2024 01:37:29 +0900
Subject: [PATCH 06/26] =?UTF-8?q?#36=20[fix]=20status=20=ED=99=95=EC=9E=A5?=
=?UTF-8?q?=20=ED=95=A8=EC=88=98=EB=A1=9C=20=EC=83=81=ED=83=9C=EB=B0=94=20?=
=?UTF-8?q?=EA=B3=A0=EC=B9=98=EB=8A=94=20=EC=BD=94=EB=93=9C=20=EC=B6=94?=
=?UTF-8?q?=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../com/sopetit/softie/ui/dailyroutine/DailyRoutineFragment.kt | 2 ++
app/src/main/java/com/sopetit/softie/ui/main/MainActivity.kt | 2 ++
.../main/java/com/sopetit/softie/ui/main/home/HomeFragment.kt | 2 ++
.../java/com/sopetit/softie/ui/onboarding/OnboardingActivity.kt | 2 ++
.../com/sopetit/softie/ui/storytelling/StoryTellingActivity.kt | 2 ++
5 files changed, 10 insertions(+)
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
index 62d7b940..54b185f9 100644
--- a/app/src/main/java/com/sopetit/softie/ui/dailyroutine/DailyRoutineFragment.kt
+++ b/app/src/main/java/com/sopetit/softie/ui/dailyroutine/DailyRoutineFragment.kt
@@ -8,6 +8,7 @@ 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
+import com.sopetit.softie.util.setStatusBarColor
class DailyRoutineFragment :
BindingFragment(R.layout.fragment_daily_routine) {
@@ -16,6 +17,7 @@ class DailyRoutineFragment :
override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
super.onViewCreated(view, savedInstanceState)
+ setStatusBarColor(R.color.background)
binding.lifecycleOwner = this
binding.dailyRoutineViewModel = dailyRoutineViewModel
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 795a6435..86e015fc 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
@@ -10,12 +10,14 @@ import com.sopetit.softie.ui.dailyroutine.DailyRoutineFragment
import com.sopetit.softie.ui.main.happy.HappyRoutineFragment
import com.sopetit.softie.ui.main.home.HomeFragment
import com.sopetit.softie.util.binding.BindingActivity
+import com.sopetit.softie.util.setStatusBarColorFromResource
import dagger.hilt.android.AndroidEntryPoint
@AndroidEntryPoint
class MainActivity : BindingActivity(R.layout.activity_main) {
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
+ setStatusBarColorFromResource(R.color.home_background)
initFragment()
initBottomNavigation()
diff --git a/app/src/main/java/com/sopetit/softie/ui/main/home/HomeFragment.kt b/app/src/main/java/com/sopetit/softie/ui/main/home/HomeFragment.kt
index cf8d505a..e84a1a28 100644
--- a/app/src/main/java/com/sopetit/softie/ui/main/home/HomeFragment.kt
+++ b/app/src/main/java/com/sopetit/softie/ui/main/home/HomeFragment.kt
@@ -5,9 +5,11 @@ import android.view.View
import com.sopetit.softie.R
import com.sopetit.softie.databinding.FragmentHomeBinding
import com.sopetit.softie.util.binding.BindingFragment
+import com.sopetit.softie.util.setStatusBarColor
class HomeFragment : BindingFragment(R.layout.fragment_home) {
override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
super.onViewCreated(view, savedInstanceState)
+ setStatusBarColor(R.color.home_background)
}
}
diff --git a/app/src/main/java/com/sopetit/softie/ui/onboarding/OnboardingActivity.kt b/app/src/main/java/com/sopetit/softie/ui/onboarding/OnboardingActivity.kt
index e0b1cad1..1047ffeb 100644
--- a/app/src/main/java/com/sopetit/softie/ui/onboarding/OnboardingActivity.kt
+++ b/app/src/main/java/com/sopetit/softie/ui/onboarding/OnboardingActivity.kt
@@ -10,6 +10,7 @@ import com.sopetit.softie.ui.onboarding.bearselection.BearSelectionFragment
import com.sopetit.softie.ui.onboarding.routinechoice.RoutineChoiceFragment
import com.sopetit.softie.ui.onboarding.themechoice.ChoiceThemeFragment
import com.sopetit.softie.util.binding.BindingActivity
+import com.sopetit.softie.util.setStatusBarColorFromResource
class OnboardingActivity :
BindingActivity(R.layout.activity_onboarding) {
@@ -19,6 +20,7 @@ class OnboardingActivity :
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
binding.viewModel = viewModel
+ setStatusBarColorFromResource(R.color.background)
initMakeFragment()
initChangeFragment()
diff --git a/app/src/main/java/com/sopetit/softie/ui/storytelling/StoryTellingActivity.kt b/app/src/main/java/com/sopetit/softie/ui/storytelling/StoryTellingActivity.kt
index 2e2a7339..97b9cad7 100644
--- a/app/src/main/java/com/sopetit/softie/ui/storytelling/StoryTellingActivity.kt
+++ b/app/src/main/java/com/sopetit/softie/ui/storytelling/StoryTellingActivity.kt
@@ -5,11 +5,13 @@ import androidx.fragment.app.Fragment
import com.sopetit.softie.R
import com.sopetit.softie.databinding.ActivityStoryTellingBinding
import com.sopetit.softie.util.binding.BindingActivity
+import com.sopetit.softie.util.setStatusBarColorFromResource
class StoryTellingActivity :
BindingActivity(R.layout.activity_story_telling) {
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
+ setStatusBarColorFromResource(R.color.story_telling_background)
initFragment()
}
From 52f4858df503e795330441d5e924df61b766dda9 Mon Sep 17 00:00:00 2001
From: Hailey <91793891+stellar-halo@users.noreply.github.com>
Date: Fri, 12 Jan 2024 01:37:55 +0900
Subject: [PATCH 07/26] =?UTF-8?q?#36=20[chore]=20home=20background=20color?=
=?UTF-8?q?=EA=B0=92=20=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
app/src/main/res/values/colors.xml | 1 +
1 file changed, 1 insertion(+)
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 1029e053..e9d6faad 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -32,6 +32,7 @@
#FFD4BBA5
#FFC4AC98
+ #FFF4F3E4
#FF259560
From 0f10afb775472dd72d0361276118fb131fe033c4 Mon Sep 17 00:00:00 2001
From: Hailey <91793891+stellar-halo@users.noreply.github.com>
Date: Fri, 12 Jan 2024 01:38:28 +0900
Subject: [PATCH 08/26] =?UTF-8?q?#36=20[chore]=20IntentFilter=20=EC=9C=84?=
=?UTF-8?q?=EC=B9=98=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
app/src/main/AndroidManifest.xml | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index c1c43f7f..f1b8205a 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -19,12 +19,12 @@
tools:targetApi="31">
-
-
@@ -48,6 +43,11 @@
+
+
Date: Fri, 12 Jan 2024 01:38:48 +0900
Subject: [PATCH 09/26] =?UTF-8?q?#36=20[chore]=20fitsSystemWindows=20?=
=?UTF-8?q?=EC=86=8D=EC=84=B1=20=EC=82=AD=EC=A0=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
app/src/main/res/layout/activity_main.xml | 1 -
1 file changed, 1 deletion(-)
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 5a47f589..b0a52779 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -10,7 +10,6 @@
Date: Fri, 12 Jan 2024 01:39:02 +0900
Subject: [PATCH 10/26] =?UTF-8?q?#36=20[chore]=20=EA=B7=B8=EB=A6=BC?=
=?UTF-8?q?=EC=9E=90=20=ED=8C=8C=EC=9D=BC=20=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
app/src/main/res/drawable/ic_shadow.xml | 9 +++++++++
1 file changed, 9 insertions(+)
create mode 100644 app/src/main/res/drawable/ic_shadow.xml
diff --git a/app/src/main/res/drawable/ic_shadow.xml b/app/src/main/res/drawable/ic_shadow.xml
new file mode 100644
index 00000000..36aeb703
--- /dev/null
+++ b/app/src/main/res/drawable/ic_shadow.xml
@@ -0,0 +1,9 @@
+
+
+
From 8cc42c7e6542bf43ed257febc816052cbfc1acbb Mon Sep 17 00:00:00 2001
From: Hailey <91793891+stellar-halo@users.noreply.github.com>
Date: Fri, 12 Jan 2024 01:40:02 +0900
Subject: [PATCH 11/26] =?UTF-8?q?#36=20[ui]=20home=20=ED=94=84=EB=9E=98?=
=?UTF-8?q?=EA=B7=B8=EB=A8=BC=ED=8A=B8=20=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
app/src/main/res/layout/fragment_home.xml | 205 +++++++++++++++++++++-
1 file changed, 198 insertions(+), 7 deletions(-)
diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml
index a781808f..ea4b67e7 100644
--- a/app/src/main/res/layout/fragment_home.xml
+++ b/app/src/main/res/layout/fragment_home.xml
@@ -1,5 +1,7 @@
-
+
@@ -7,14 +9,203 @@
+ android:layout_height="match_parent"
+ android:background="@color/home_background">
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ style="@style/bubble16"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_marginTop="12dp"
+ android:background="@drawable/shape_namefill_fill_namestroke_stroke_99_rect"
+ android:paddingHorizontal="13dp"
+ android:paddingVertical="9dp"
+ android:text="테스트"
+ android:textColor="@color/gray700"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toBottomOf="@id/iv_home_shadow"
+ tools:text="애착이" />
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
From 95415b79ff33ab2db3fe23b102755261362bc0c9 Mon Sep 17 00:00:00 2001
From: Hailey <91793891+stellar-halo@users.noreply.github.com>
Date: Fri, 12 Jan 2024 01:41:58 +0900
Subject: [PATCH 12/26] =?UTF-8?q?#36=20[ui]=20=EC=82=AC=EC=9A=A9=EC=9E=90?=
=?UTF-8?q?=EA=B0=80=20=EA=B8=80=EC=94=A8=20=ED=81=AC=EA=B8=B0=20=EA=B3=A0?=
=?UTF-8?q?=EC=B3=90=EB=8F=84=20=EB=B0=94=EB=80=8C=EC=A7=80=20=EC=95=8A?=
=?UTF-8?q?=EA=B2=8C=20sp=20->=20dp=EB=A1=9C=20=EB=B3=80=EA=B2=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
app/src/main/res/values/appearance.xml | 32 +++++++++++++-------------
1 file changed, 16 insertions(+), 16 deletions(-)
diff --git a/app/src/main/res/values/appearance.xml b/app/src/main/res/values/appearance.xml
index 8bfb5aee..d80b195f 100644
--- a/app/src/main/res/values/appearance.xml
+++ b/app/src/main/res/values/appearance.xml
@@ -5,99 +5,99 @@
From 9f0a7c35c44dd8fc2b3da67d5856d5d759b47ef5 Mon Sep 17 00:00:00 2001
From: Hailey <91793891+stellar-halo@users.noreply.github.com>
Date: Fri, 12 Jan 2024 01:47:52 +0900
Subject: [PATCH 13/26] =?UTF-8?q?#36=20[fix]=20=EC=83=81=EB=8B=A8=20margin?=
=?UTF-8?q?=20=EC=82=AD=EC=A0=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
app/src/main/res/layout/activity_daily_routine_edit.xml | 1 -
app/src/main/res/layout/activity_happy_add_list.xml | 2 +-
app/src/main/res/layout/activity_onboarding.xml | 2 +-
app/src/main/res/layout/activity_setting.xml | 2 +-
app/src/main/res/layout/fragment_daily_routine.xml | 1 -
app/src/main/res/layout/fragment_happy_routine.xml | 2 +-
6 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/app/src/main/res/layout/activity_daily_routine_edit.xml b/app/src/main/res/layout/activity_daily_routine_edit.xml
index c7d9a384..81505344 100644
--- a/app/src/main/res/layout/activity_daily_routine_edit.xml
+++ b/app/src/main/res/layout/activity_daily_routine_edit.xml
@@ -23,7 +23,6 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="20dp"
- android:layout_marginTop="24dp"
android:paddingVertical="16dp"
android:text="@string/daily_routine_edit_name"
android:textAppearance="@style/body1"
diff --git a/app/src/main/res/layout/activity_happy_add_list.xml b/app/src/main/res/layout/activity_happy_add_list.xml
index db6c9a58..70e8ecd5 100644
--- a/app/src/main/res/layout/activity_happy_add_list.xml
+++ b/app/src/main/res/layout/activity_happy_add_list.xml
@@ -18,7 +18,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="18dp"
- android:layout_marginTop="40dp"
+ android:layout_marginTop="16dp"
android:src="@drawable/ic_back_arrow"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
diff --git a/app/src/main/res/layout/activity_onboarding.xml b/app/src/main/res/layout/activity_onboarding.xml
index f2cf65ed..5e7cd899 100644
--- a/app/src/main/res/layout/activity_onboarding.xml
+++ b/app/src/main/res/layout/activity_onboarding.xml
@@ -31,7 +31,7 @@
android:id="@+id/iv_onboarding_top_bar_first"
android:layout_width="0dp"
android:layout_height="6dp"
- android:layout_marginTop="52dp"
+ android:layout_marginTop="28dp"
android:layout_marginEnd="5dp"
android:src="@{viewModel.bearChoiceView ? @drawable/shape_main1_fill_99_rect : @drawable/shape_gray100_fill_99_rect}"
app:layout_constraintEnd_toStartOf="@id/iv_onboarding_top_bar_second"
diff --git a/app/src/main/res/layout/activity_setting.xml b/app/src/main/res/layout/activity_setting.xml
index 6c680657..f01a020a 100644
--- a/app/src/main/res/layout/activity_setting.xml
+++ b/app/src/main/res/layout/activity_setting.xml
@@ -22,7 +22,7 @@
android:src="@drawable/ic_back_arrow"
android:background="@android:color/transparent"
android:layout_marginStart="18dp"
- android:layout_marginTop="40dp"
+ android:layout_marginTop="16dp"
android:padding="5dp"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintStart_toStartOf="parent" />
diff --git a/app/src/main/res/layout/fragment_daily_routine.xml b/app/src/main/res/layout/fragment_daily_routine.xml
index 80b3b9b9..b53a4003 100644
--- a/app/src/main/res/layout/fragment_daily_routine.xml
+++ b/app/src/main/res/layout/fragment_daily_routine.xml
@@ -23,7 +23,6 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="20dp"
- android:layout_marginTop="24dp"
android:paddingVertical="16dp"
android:text="@string/daily_routine_edit_name"
android:textAppearance="@style/body1"
diff --git a/app/src/main/res/layout/fragment_happy_routine.xml b/app/src/main/res/layout/fragment_happy_routine.xml
index 6d29d861..fec29257 100644
--- a/app/src/main/res/layout/fragment_happy_routine.xml
+++ b/app/src/main/res/layout/fragment_happy_routine.xml
@@ -17,7 +17,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="20dp"
- android:layout_marginTop="40dp"
+ android:layout_marginTop="16dp"
android:text="@string/happy_title"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
From 487712a6a8d3440bf735c78a33a9e0eaf8fc8fbf Mon Sep 17 00:00:00 2001
From: Hailey <91793891+stellar-halo@users.noreply.github.com>
Date: Fri, 12 Jan 2024 01:48:33 +0900
Subject: [PATCH 14/26] =?UTF-8?q?#36=20[chore]=20marginLeft=20->=20marginS?=
=?UTF-8?q?tart=EB=A1=9C=20=EB=B3=80=EA=B2=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
app/src/main/res/layout/activity_happy_add_list.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app/src/main/res/layout/activity_happy_add_list.xml b/app/src/main/res/layout/activity_happy_add_list.xml
index 70e8ecd5..7bd972eb 100644
--- a/app/src/main/res/layout/activity_happy_add_list.xml
+++ b/app/src/main/res/layout/activity_happy_add_list.xml
@@ -27,7 +27,7 @@
android:id="@+id/tv_happy_add_title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_marginLeft="12dp"
+ android:layout_marginStart="12dp"
android:text="@string/happy_add_title"
android:textAppearance="@style/body1"
app:layout_constraintBottom_toBottomOf="@id/iv_happy_add_back_arrow"
From 310195b2d03a50ace3a80243542d287fa2bd2f4f Mon Sep 17 00:00:00 2001
From: Hailey <