diff --git a/app-ui-catalog/src/main/java/app/k9mail/ui/catalog/CatalogActivity.kt b/app-ui-catalog/src/main/java/app/k9mail/ui/catalog/CatalogActivity.kt index 799e9c7d1..41b45a446 100644 --- a/app-ui-catalog/src/main/java/app/k9mail/ui/catalog/CatalogActivity.kt +++ b/app-ui-catalog/src/main/java/app/k9mail/ui/catalog/CatalogActivity.kt @@ -2,19 +2,18 @@ package app.k9mail.ui.catalog import android.os.Bundle import androidx.activity.ComponentActivity +import androidx.activity.enableEdgeToEdge import androidx.core.splashscreen.SplashScreen.Companion.installSplashScreen -import androidx.core.view.WindowCompat import app.k9mail.core.ui.compose.common.activity.setActivityContent import app.k9mail.ui.catalog.ui.CatalogScreen class CatalogActivity : ComponentActivity() { override fun onCreate(savedInstanceState: Bundle?) { installSplashScreen() + enableEdgeToEdge() super.onCreate(savedInstanceState) - WindowCompat.setDecorFitsSystemWindows(window, false) - setActivityContent { CatalogScreen() } diff --git a/app/core/src/main/res/values/k9_tonal_palette.xml b/app/core/src/main/res/values/k9_tonal_palette.xml index 76194a386..9f83946fd 100644 --- a/app/core/src/main/res/values/k9_tonal_palette.xml +++ b/app/core/src/main/res/values/k9_tonal_palette.xml @@ -1,13 +1,13 @@ #000000 - #3F001B - #5E112F - #7B2946 - #99405D - #B75876 - #D6718F - #F68BAA + #38091B + #521F30 + #6D3546 + #894C5D + #A66476 + #C37D8F + #E196AA #FFB1C5 #FFD9E1 #FFECEF @@ -15,82 +15,82 @@ #FFFFFF #000000 - #2B151B - #422930 - #5B3F46 - #74565E - #8F6F76 - #AA8890 - #C6A2AA - #E3BDC5 - #FFD9E1 + #27171B + #3D2C30 + #554246 + #6E595E + #887176 + #A38B90 + #BEA5AA + #DBC0C5 + #F8DCE1 #FFECEF #FFFBFF #FFFFFF #000000 - #260059 - #3C1D70 - #533688 - #6B4EA2 - #8567BD - #9F81D9 - #BA9CF6 - #D3BBFF - #EBDDFF - #F7EDFF - #FFFBFF + #230E48 + #38255E + #4F3C76 + #685490 + #816DAB + #9B86C6 + #B6A0E2 + #D2BBFF + #EADDFF + #F6EDFF + #FFFBFA #FFFFFF #000000 - #410002 - #690005 - #93000A - #BA1A1A - #DE3730 - #FF5449 - #FF897D - #FFB4AB - #FFDAD6 - #FFEDEA - #FFFBFF + #410E0B + #601410 + #8C1D18 + #B3261E + #DC362E + #E46962 + #EC928E + #F2B8B5 + #F9DEDC + #FCEEEE + #FFFBF9 #FFFFFF #000000 - #120D0E - #171213 - #201A1B - #241E1F - #2F282A - #352F30 - #3A3334 - #3E3739 - #4C4546 - #655C5E - #7E7576 - #988E90 - #B3A9AA - #CFC4C5 - #E3D7D8 - #ECE0E1 - #F1E5E6 - #F7EBEC - #FAEEEF - #FDF1F2 + #140C0E + #191113 + #22191B + #261D1F + #31282A + #342F30 + #3C3234 + #413739 + #4B4546 + #635D5E + #7C7576 + #968F90 + #B1A9AA + #CDC4C5 + #E6D6D8 + #EFDFE1 + #F5E4E6 + #FBEAEC + #F8EEEF + #FFF0F2 #FFF8F8 #FFFFFF #000000 - #24191B - #3A2D30 - #514346 - #6A5A5E - #847376 - #9E8C90 - #BAA7AA - #D6C2C5 - #F3DDE1 - #FFECEF + #211A1B + #372E30 + #4E4446 + #675C5E + #807476 + #9A8E90 + #B6A8AA + #D2C3C5 + #EEDFE1 + #FDEDEF #FFFBFF #FFFFFF diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/activity/MessageList.kt b/app/ui/legacy/src/main/java/com/fsck/k9/activity/MessageList.kt index 229a426a5..f8458796d 100644 --- a/app/ui/legacy/src/main/java/com/fsck/k9/activity/MessageList.kt +++ b/app/ui/legacy/src/main/java/com/fsck/k9/activity/MessageList.kt @@ -4,21 +4,17 @@ import android.app.SearchManager import android.content.Context import android.content.Intent import android.content.res.Configuration -import android.graphics.Color -import android.os.Build import android.os.Bundle import android.os.Parcelable import android.view.KeyEvent import android.view.Menu import android.view.MenuItem import android.view.View -import android.view.WindowManager import android.view.animation.AnimationUtils import android.widget.ProgressBar import androidx.appcompat.app.ActionBar import androidx.appcompat.view.ActionMode import androidx.appcompat.widget.SearchView -import androidx.appcompat.widget.Toolbar import androidx.drawerlayout.widget.DrawerLayout import androidx.drawerlayout.widget.DrawerLayout.DrawerListener import androidx.fragment.app.FragmentManager @@ -165,23 +161,6 @@ open class MessageList : } } - window.statusBarColor = Color.TRANSPARENT - - val rootLayout = findViewById(R.id.drawerLayout) - - rootLayout.systemUiVisibility = rootLayout.systemUiVisibility or View.SYSTEM_UI_FLAG_LAYOUT_STABLE or - View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN - - if (Build.VERSION.SDK_INT < Build.VERSION_CODES.M) { - window.addFlags(WindowManager.LayoutParams.FLAG_TRANSLUCENT_STATUS) - } - - val toolbar = findViewById(R.id.toolbar) - toolbar.setOnApplyWindowInsetsListener { view, insets -> - view.setPadding(view.paddingLeft, insets.systemWindowInsetTop, view.paddingRight, view.paddingBottom) - insets - } - val swipeRefreshLayout = findViewById(R.id.material_drawer_swipe_refresh) swipeRefreshLayout.layoutParams.width = getOptimalDrawerWidth(this) diff --git a/app/ui/legacy/src/main/res/layout/message_compose_content.xml b/app/ui/legacy/src/main/res/layout/message_compose_content.xml index 81a804f7c..2a34fe2cb 100644 --- a/app/ui/legacy/src/main/res/layout/message_compose_content.xml +++ b/app/ui/legacy/src/main/res/layout/message_compose_content.xml @@ -22,10 +22,9 @@ the 'composer theme' setting). diff --git a/app/ui/legacy/src/main/res/values-v27/themes.xml b/app/ui/legacy/src/main/res/values-v27/themes.xml index 16aa84bf0..473ffa181 100644 --- a/app/ui/legacy/src/main/res/values-v27/themes.xml +++ b/app/ui/legacy/src/main/res/values-v27/themes.xml @@ -2,18 +2,18 @@ diff --git a/app/ui/legacy/src/main/res/values/styles.xml b/app/ui/legacy/src/main/res/values/styles.xml index 7cfbbe63e..4ce0f6ecd 100644 --- a/app/ui/legacy/src/main/res/values/styles.xml +++ b/app/ui/legacy/src/main/res/values/styles.xml @@ -3,17 +3,20 @@ + + + + +