prifak/Kotatsu
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Insets suffering continue

Browse Source
This commit is contained in:
Zakhar Timoshenko
2022-08-08 04:47:05 +03:00
parent ec8d4b56b5
commit 890c13d83a
12 changed files with 32 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
app/src/main/java/org/koitharu/kotatsu/bookmarks/ui/BookmarksActivity.kt
View File

@@ -3,8 +3,10 @@ package org.koitharu.kotatsu.bookmarks.ui
import android.content.Context
import android.content.Intent
import android.os.Bundle
import android.view.ViewGroup
import androidx.coordinatorlayout.widget.CoordinatorLayout
import androidx.core.graphics.Insets
import androidx.core.view.updateLayoutParams
import androidx.core.view.updatePadding
import androidx.fragment.app.commit
import com.google.android.material.appbar.AppBarLayout
@@ -25,7 +27,7 @@ class BookmarksActivity :
get() = binding.appbar
override val snackbarHost: CoordinatorLayout
get() = binding.coordinator
get() = binding.root
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
@@ -41,12 +43,10 @@ class BookmarksActivity :
}
override fun onWindowInsetsChanged(insets: Insets) {
with(binding.toolbar) {
updatePadding(
left = insets.left,
right = insets.right,
)
}
binding.root.updatePadding(
left = insets.left,
right = insets.right,
)
}
companion object {

10
app/src/main/java/org/koitharu/kotatsu/browser/BrowserActivity.kt
View File

@@ -8,14 +8,16 @@ import android.net.Uri
import android.os.Bundle
import android.view.Menu
import android.view.MenuItem
import android.view.ViewGroup
import androidx.core.graphics.Insets
import androidx.core.view.isVisible
import androidx.core.view.updateLayoutParams
import androidx.core.view.updatePadding
import com.google.android.material.R as materialR
import org.koitharu.kotatsu.R
import org.koitharu.kotatsu.base.ui.BaseActivity
import org.koitharu.kotatsu.core.network.UserAgentInterceptor
import org.koitharu.kotatsu.databinding.ActivityBrowserBinding
import com.google.android.material.R as materialR
@SuppressLint("SetJavaScriptEnabled")
class BrowserActivity : BaseActivity<ActivityBrowserBinding>(), BrowserCallback {
@@ -42,7 +44,7 @@ class BrowserActivity : BaseActivity<ActivityBrowserBinding>(), BrowserCallback
} else {
onTitleChanged(
intent?.getStringExtra(EXTRA_TITLE) ?: getString(R.string.loading_),
url
url,
)
binding.webView.loadUrl(url)
}
@@ -117,8 +119,6 @@ class BrowserActivity : BaseActivity<ActivityBrowserBinding>(), BrowserCallback
override fun onWindowInsetsChanged(insets: Insets) {
binding.appbar.updatePadding(
top = insets.top,
left = insets.left,
right = insets.right,
)
binding.root.updatePadding(
left = insets.left,
@@ -137,4 +137,4 @@ class BrowserActivity : BaseActivity<ActivityBrowserBinding>(), BrowserCallback
.putExtra(EXTRA_TITLE, title)
}
}
}
}

8
app/src/main/java/org/koitharu/kotatsu/download/ui/DownloadsActivity.kt
View File

@@ -45,14 +45,12 @@ class DownloadsActivity : BaseActivity<ActivityDownloadsBinding>() {
}
override fun onWindowInsetsChanged(insets: Insets) {
binding.recyclerView.updatePadding(
binding.root.updatePadding(
left = insets.left,
right = insets.right,
bottom = insets.bottom,
)
binding.toolbar.updatePadding(
left = insets.left,
right = insets.right,
binding.recyclerView.updatePadding(
bottom = insets.bottom,
)
}

2
app/src/main/java/org/koitharu/kotatsu/favourites/ui/FavouritesActivity.kt
View File

@@ -35,7 +35,7 @@ class FavouritesActivity : BaseActivity<ActivityContainerBinding>() {
}
override fun onWindowInsetsChanged(insets: Insets) {
binding.toolbar.updatePadding(
binding.root.updatePadding(
left = insets.left,
right = insets.right,
)

8
app/src/main/java/org/koitharu/kotatsu/favourites/ui/categories/FavouriteCategoriesActivity.kt
View File

@@ -136,10 +136,12 @@ class FavouriteCategoriesActivity :
leftMargin = topMargin + insets.left
bottomMargin = topMargin + insets.bottom
}
binding.recyclerView.updatePadding(
binding.root.updatePadding(
left = insets.left,
right = insets.right,
bottom = 2 * insets.bottom + binding.fabAdd.measureHeight(),
right = insets.right
)
binding.recyclerView.updatePadding(
bottom = insets.bottom,
)
}

4
app/src/main/java/org/koitharu/kotatsu/favourites/ui/categories/edit/FavouritesCategoryEditActivity.kt
View File

@@ -94,9 +94,11 @@ class FavouritesCategoryEditActivity :
}
override fun onWindowInsetsChanged(insets: Insets) {
binding.scrollView.updatePadding(
binding.root.updatePadding(
left = insets.left,
right = insets.right,
)
binding.scrollView.updatePadding(
bottom = insets.bottom,
)
binding.toolbar.updateLayoutParams<ViewGroup.MarginLayoutParams> {

6
app/src/main/java/org/koitharu/kotatsu/history/ui/HistoryActivity.kt
View File

@@ -3,9 +3,7 @@ package org.koitharu.kotatsu.history.ui
import android.content.Context
import android.content.Intent
import android.os.Bundle
import android.view.ViewGroup
import androidx.core.graphics.Insets
import androidx.core.view.updateLayoutParams
import androidx.core.view.updatePadding
import androidx.fragment.app.commit
import com.google.android.material.appbar.AppBarLayout
@@ -37,10 +35,6 @@ class HistoryActivity :
}
override fun onWindowInsetsChanged(insets: Insets) {
binding.toolbar.updateLayoutParams<ViewGroup.MarginLayoutParams> {
leftMargin = insets.left
rightMargin = insets.right
}
binding.root.updatePadding(
left = insets.left,
right = insets.right,

7
app/src/main/java/org/koitharu/kotatsu/main/ui/MainActivity.kt
View File

@@ -157,7 +157,12 @@ class MainActivity :
}
}
override fun onWindowInsetsChanged(insets: Insets) = Unit
override fun onWindowInsetsChanged(insets: Insets) {
binding.root.updatePadding(
left = insets.left,
right = insets.right,
)
}
override fun onFocusChange(v: View?, hasFocus: Boolean) {
val fragment = supportFragmentManager.findFragmentByTag(TAG_SEARCH)

4
app/src/main/java/org/koitharu/kotatsu/search/ui/multi/MultiSearchActivity.kt
View File

@@ -90,14 +90,12 @@ class MultiSearchActivity :
}
override fun onWindowInsetsChanged(insets: Insets) {
binding.toolbar.updatePadding(
binding.root.updatePadding(
left = insets.left,
right = insets.right,
)
binding.recyclerView.updatePadding(
bottom = insets.bottom,
left = insets.left,
right = insets.right,
)
}

6
app/src/main/java/org/koitharu/kotatsu/suggestions/ui/SuggestionsActivity.kt
View File

@@ -3,9 +3,7 @@ package org.koitharu.kotatsu.suggestions.ui
import android.content.Context
import android.content.Intent
import android.os.Bundle
import android.view.ViewGroup
import androidx.core.graphics.Insets
import androidx.core.view.updateLayoutParams
import androidx.core.view.updatePadding
import androidx.fragment.app.commit
import com.google.android.material.appbar.AppBarLayout
@@ -37,10 +35,6 @@ class SuggestionsActivity :
}
override fun onWindowInsetsChanged(insets: Insets) {
binding.toolbar.updateLayoutParams<ViewGroup.MarginLayoutParams> {
leftMargin = insets.left
rightMargin = insets.right
}
binding.root.updatePadding(
left = insets.left,
right = insets.right,

1
app/src/main/java/org/koitharu/kotatsu/utils/ext/ViewExt.kt
View File

@@ -6,7 +6,6 @@ import android.view.View
import android.view.ViewGroup
import android.view.ViewParent
import android.view.inputmethod.InputMethodManager
import androidx.core.view.ViewCompat
import androidx.core.view.children
import androidx.recyclerview.widget.LinearLayoutManager
import androidx.recyclerview.widget.RecyclerView

2
app/src/main/res/layout/fragment_list.xml
View File

@@ -24,4 +24,4 @@
</FrameLayout>
</androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
</androidx.swiperefreshlayout.widget.SwipeRefreshLayout>