diff --git a/app/src/main/java/com/sopetit/softie/SoftieApplication.kt b/app/src/main/java/com/sopetit/softie/SoftieApplication.kt
index bc5acb18..3d881cb1 100644
--- a/app/src/main/java/com/sopetit/softie/SoftieApplication.kt
+++ b/app/src/main/java/com/sopetit/softie/SoftieApplication.kt
@@ -1,6 +1,10 @@
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
@@ -12,5 +16,42 @@ 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
+ )
}
}
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 fbc5ba08..0d16897e 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
@@ -2,7 +2,6 @@ package com.sopetit.softie.ui.onboarding
import android.os.Bundle
import androidx.activity.viewModels
-import androidx.core.content.ContextCompat
import androidx.fragment.app.Fragment
import com.sopetit.softie.R
import com.sopetit.softie.databinding.ActivityOnboardingBinding
@@ -20,15 +19,10 @@ class OnboardingActivity :
super.onCreate(savedInstanceState)
binding.viewModel = viewModel
- initStatusBarColor()
initMakeFragment()
initChangeFragment()
}
- private fun initStatusBarColor() {
- window.statusBarColor = ContextCompat.getColor(this, R.color.background)
- }
-
private fun initMakeFragment() {
val currentFragment = supportFragmentManager.findFragmentById(R.id.fcv_onboarding_fragment)
if (currentFragment == null) {
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 e49fe6e5..2e2a7339 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
@@ -1,7 +1,6 @@
package com.sopetit.softie.ui.storytelling
import android.os.Bundle
-import androidx.core.content.ContextCompat
import androidx.fragment.app.Fragment
import com.sopetit.softie.R
import com.sopetit.softie.databinding.ActivityStoryTellingBinding
@@ -13,7 +12,6 @@ class StoryTellingActivity :
super.onCreate(savedInstanceState)
initFragment()
- initStatusBarColor()
}
private fun initFragment() {
@@ -26,10 +24,6 @@ class StoryTellingActivity :
}
}
- private fun initStatusBarColor() {
- window.statusBarColor = ContextCompat.getColor(this, R.color.story_telling_background)
- }
-
fun replaceFragment(fragment: Fragment) {
val fragmentManager = supportFragmentManager
val fragmentTransaction = fragmentManager.beginTransaction()
diff --git a/app/src/main/res/layout/activity_happy.xml b/app/src/main/res/layout/activity_happy.xml
index 593dadaa..ac4ff7ca 100644
--- a/app/src/main/res/layout/activity_happy.xml
+++ b/app/src/main/res/layout/activity_happy.xml
@@ -8,7 +8,8 @@
+ android:layout_height="match_parent"
+ android:fitsSystemWindows="true">
+ tools:context=".ui.main.MainActivity"
+ android:fitsSystemWindows="true">
-
\ No newline at end of file
+
diff --git a/app/src/main/res/layout/activity_onboarding.xml b/app/src/main/res/layout/activity_onboarding.xml
index 175ccb27..a65a81f7 100644
--- a/app/src/main/res/layout/activity_onboarding.xml
+++ b/app/src/main/res/layout/activity_onboarding.xml
@@ -13,7 +13,8 @@
+ android:layout_height="match_parent"
+ android:fitsSystemWindows="true">
+ android:layout_height="match_parent"
+ android:fitsSystemWindows="true">
diff --git a/app/src/main/res/layout/fragment_story_telling_intro.xml b/app/src/main/res/layout/fragment_story_telling_intro.xml
index 07d558d7..3194e766 100644
--- a/app/src/main/res/layout/fragment_story_telling_intro.xml
+++ b/app/src/main/res/layout/fragment_story_telling_intro.xml
@@ -16,7 +16,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="20dp"
- android:layout_marginTop="194dp"
+ android:layout_marginTop="218dp"
android:src="@drawable/ic_girl1"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
diff --git a/app/src/main/res/layout/fragment_story_telling_main.xml b/app/src/main/res/layout/fragment_story_telling_main.xml
index 57e813d6..d3d7b55a 100644
--- a/app/src/main/res/layout/fragment_story_telling_main.xml
+++ b/app/src/main/res/layout/fragment_story_telling_main.xml
@@ -22,7 +22,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="20dp"
- android:layout_marginTop="194dp"
+ android:layout_marginTop="218dp"
android:src="@drawable/ic_girl2"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index 334fd1a9..f364ebb1 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -4,6 +4,9 @@
- false
- true
+ - true
+ - @android:color/transparent
+ - true