Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -1,8 +1,12 @@
package com.into.websoso.core.common.ui.base

import android.os.Bundle
import androidx.activity.enableEdgeToEdge
import androidx.annotation.LayoutRes
import androidx.appcompat.app.AppCompatActivity
import androidx.core.view.ViewCompat
import androidx.core.view.WindowInsetsCompat
import androidx.core.view.updatePadding
import androidx.databinding.DataBindingUtil
import androidx.databinding.ViewDataBinding

Expand All @@ -14,6 +18,19 @@ abstract class BaseActivity<B : ViewDataBinding>(

override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
enableEdgeToEdge()
_binding = DataBindingUtil.setContentView(this, layoutResId)
ViewCompat.setOnApplyWindowInsetsListener(binding.root) { v, insets ->
val bars = insets.getInsets(WindowInsetsCompat.Type.systemBars())
val ime = insets.getInsets(WindowInsetsCompat.Type.ime())
val bottom = kotlin.math.max(bars.bottom, ime.bottom)
v.updatePadding(
top = bars.top,
bottom = bottom,
left = bars.left,
right = bars.right,
)
insets
}
}
}
4 changes: 3 additions & 1 deletion app/src/main/java/com/into/websoso/ui/main/MainActivity.kt
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import android.view.View
import androidx.activity.OnBackPressedCallback
import androidx.activity.viewModels
import androidx.annotation.IntegerRes
import androidx.core.view.WindowCompat
import androidx.fragment.app.Fragment
import androidx.fragment.app.commit
import com.into.websoso.R.id.fcv_main
Expand Down Expand Up @@ -51,6 +52,7 @@ class MainActivity : BaseActivity<ActivityMainBinding>(activity_main) {

override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
WindowCompat.setDecorFitsSystemWindows(window, false)

setupBackButtonListener()
setupBottomNavigationView()
Expand Down Expand Up @@ -137,7 +139,7 @@ class MainActivity : BaseActivity<ActivityMainBinding>(activity_main) {
when {
it is LibraryFragment && !isLibrary -> hide(it)
it != targetFragment -> remove(it)
else -> { /* 아무 것도 하지 않음. 나도 아무 것도 안하고 싶다...격하게 */ }
else -> {}
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import android.content.Intent
import android.os.Bundle
import androidx.activity.ComponentActivity
import androidx.activity.compose.setContent
import androidx.activity.enableEdgeToEdge
import androidx.activity.viewModels
import com.into.websoso.core.common.ui.model.ResultFrom
import com.into.websoso.core.common.util.setupWhiteStatusBar
Expand All @@ -20,6 +21,7 @@ class NotificationActivity : ComponentActivity() {

override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
enableEdgeToEdge()
this.setupWhiteStatusBar()

setContent {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,10 @@ package com.into.websoso.ui.notification
import androidx.activity.compose.BackHandler
import androidx.compose.foundation.background
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.WindowInsets
import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.foundation.layout.systemBars
import androidx.compose.foundation.layout.windowInsetsPadding
import androidx.compose.runtime.Composable
import androidx.compose.runtime.getValue
import androidx.compose.ui.Modifier
Expand All @@ -29,7 +32,8 @@ fun NotificationScreen(
Column(
modifier = Modifier
.fillMaxSize()
.background(White),
.background(White)
.windowInsetsPadding(WindowInsets.systemBars),
) {
NotificationAppBar(onBackButtonClick)
NotificationsContainer(
Expand Down
8 changes: 3 additions & 5 deletions app/src/main/res/layout/activity_main.xml
Original file line number Diff line number Diff line change
Expand Up @@ -32,15 +32,13 @@
<com.google.android.material.bottomnavigation.BottomNavigationView
android:id="@+id/bnv_main"
android:layout_width="match_parent"
android:layout_height="58dp"
android:layout_height="wrap_content"
android:elevation="0dp"
android:outlineProvider="none"
app:elevation="0dp"
app:itemActiveIndicatorStyle="@color/white"
app:itemActiveIndicatorStyle="@null"
app:itemIconSize="24dp"
app:itemIconTint="@color/bg_main_bottom_nav_item_selector"
app:itemPaddingBottom="12dp"
app:itemPaddingTop="10dp"
app:itemTextAppearanceActive="@style/label2"
app:itemTextAppearanceInactive="@style/label2"
app:itemTextColor="@color/bg_main_bottom_nav_item_selector"
Expand All @@ -60,4 +58,4 @@
app:layout_constraintTop_toTopOf="parent" />

</androidx.constraintlayout.widget.ConstraintLayout>
</layout>
</layout>
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.Spacer
import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.foundation.layout.height
import androidx.compose.foundation.layout.statusBarsPadding
import androidx.compose.foundation.lazy.LazyListState
import androidx.compose.foundation.lazy.grid.LazyGridState
import androidx.compose.foundation.lazy.grid.rememberLazyGridState
Expand Down Expand Up @@ -141,8 +140,7 @@ private fun LibraryScreen(
Column(
modifier = Modifier
.fillMaxSize()
.background(White)
.statusBarsPadding(),
.background(White),
) {
Spacer(modifier = Modifier.height(20.dp))

Expand Down