diff --git a/app/src/main/java/ani/dantotsu/Functions.kt b/app/src/main/java/ani/dantotsu/Functions.kt index 9a5e6259..afc14391 100644 --- a/app/src/main/java/ani/dantotsu/Functions.kt +++ b/app/src/main/java/ani/dantotsu/Functions.kt @@ -4,7 +4,6 @@ import android.animation.ObjectAnimator import android.annotation.SuppressLint import android.app.Activity import android.app.DatePickerDialog -import android.app.Notification import android.app.NotificationManager import android.app.PendingIntent import android.content.ClipData @@ -160,22 +159,11 @@ fun initActivity(a: Activity) { } } a.hideStatusBar() - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R && - statusBarHeight == 0 && - a.resources.configuration.orientation == Configuration.ORIENTATION_PORTRAIT - ) { - window.setDecorFitsSystemWindows(false) - - window.decorView.setOnApplyWindowInsetsListener { _, insets -> - statusBarHeight = insets.getInsets(WindowInsetsCompat.Type.systemBars()).top - navBarHeight = insets.getInsets(WindowInsetsCompat.Type.systemBars()).bottom - insets - } - - window.insetsController?.let { controller -> - controller.systemBarsBehavior = - WindowInsetsController.BEHAVIOR_SHOW_TRANSIENT_BARS_BY_SWIPE - controller.hide(WindowInsetsCompat.Type.navigationBars()) + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P && statusBarHeight == 0 && a.resources.configuration.orientation == Configuration.ORIENTATION_PORTRAIT) { + window.decorView.rootWindowInsets?.displayCutout?.apply { + if (boundingRects.size > 0) { + statusBarHeight = min(boundingRects[0].width(), boundingRects[0].height()) + } } } } else diff --git a/app/src/main/java/ani/dantotsu/MainActivity.kt b/app/src/main/java/ani/dantotsu/MainActivity.kt index 5f588543..43980389 100644 --- a/app/src/main/java/ani/dantotsu/MainActivity.kt +++ b/app/src/main/java/ani/dantotsu/MainActivity.kt @@ -14,7 +14,6 @@ import android.provider.Settings import android.util.Log import android.view.View import android.view.ViewGroup -import android.view.WindowManager import android.view.animation.AnticipateInterpolator import android.widget.TextView import androidx.activity.addCallback @@ -24,9 +23,7 @@ import androidx.appcompat.app.AppCompatActivity import androidx.core.animation.doOnEnd import androidx.core.content.ContextCompat import androidx.core.view.doOnAttach -import androidx.core.view.marginTop import androidx.core.view.updateLayoutParams -import androidx.core.view.updatePadding import androidx.fragment.app.Fragment import androidx.fragment.app.FragmentManager import androidx.lifecycle.Lifecycle @@ -203,10 +200,9 @@ class MainActivity : AppCompatActivity() { } else { uiSettings.defaultStartUpTab } - if (!uiSettings.immersiveMode) { - binding.includedNavbar.navbarContainer.updateLayoutParams { - bottomMargin = navBarHeight - } + binding.includedNavbar.navbarContainer.updateLayoutParams { + bottomMargin = navBarHeight + } } val offline = getSharedPreferences("Dantotsu", Context.MODE_PRIVATE) diff --git a/app/src/main/java/ani/dantotsu/connections/anilist/AnilistQueries.kt b/app/src/main/java/ani/dantotsu/connections/anilist/AnilistQueries.kt index 2302a3d6..8a6a813e 100644 --- a/app/src/main/java/ani/dantotsu/connections/anilist/AnilistQueries.kt +++ b/app/src/main/java/ani/dantotsu/connections/anilist/AnilistQueries.kt @@ -11,6 +11,7 @@ import ani.dantotsu.connections.anilist.api.FuzzyDate import ani.dantotsu.connections.anilist.api.Page import ani.dantotsu.connections.anilist.api.Query import ani.dantotsu.currContext +import ani.dantotsu.isOnline import ani.dantotsu.loadData import ani.dantotsu.logError import ani.dantotsu.media.Author @@ -240,7 +241,9 @@ class AnilistQueries { else snackString(currContext()?.getString(R.string.what_did_you_open)) } } else { - snackString(currContext()?.getString(R.string.error_getting_data)) + if (currContext()?.let { isOnline(it) } == true) { + snackString(currContext()?.getString(R.string.error_getting_data)) + } } } val mal = async { diff --git a/app/src/main/java/ani/dantotsu/home/NoInternet.kt b/app/src/main/java/ani/dantotsu/home/NoInternet.kt index 7b6aba26..147cf887 100644 --- a/app/src/main/java/ani/dantotsu/home/NoInternet.kt +++ b/app/src/main/java/ani/dantotsu/home/NoInternet.kt @@ -78,10 +78,9 @@ class NoInternet : AppCompatActivity() { initActivity(this) uiSettings = loadData("ui_settings") ?: uiSettings selectedOption = uiSettings.defaultStartUpTab - if (!uiSettings.immersiveMode) { - binding.includedNavbar.navbarContainer.updateLayoutParams { - bottomMargin = navBarHeight - } + + binding.includedNavbar.navbarContainer.updateLayoutParams { + bottomMargin = navBarHeight } } val navbar = binding.includedNavbar.navbar diff --git a/app/src/main/res/layout/fragment_offline.xml b/app/src/main/res/layout/fragment_offline.xml index fab8a45c..1c4824a0 100644 --- a/app/src/main/res/layout/fragment_offline.xml +++ b/app/src/main/res/layout/fragment_offline.xml @@ -8,7 +8,25 @@ android:id="@+id/refreshContainer" android:layout_width="match_parent" android:layout_height="match_parent"> - + + + + + @@ -74,10 +74,9 @@ android:textSize="20sp" tools:text="12" /> - + + + app:srcCompat="@drawable/ic_round_download_24" + tools:ignore="ContentDescription" /> @@ -178,14 +189,5 @@ android:background="?android:colorBackground" android:visibility="gone" /> - \ No newline at end of file