rixxc/KeePassDX
1
0
Fork 0
mirror of https://github.com/Kunzisoft/KeePassDX.git synced 2025-12-04 15:49:33 +01:00
Code Issues Packages Projects Releases Wiki Activity

[RTL] Fix padding of toolbar buttons

Browse Source
This commit is contained in:
codokie
2025-04-05 23:22:25 +03:00
parent 4f0ff67fdf
commit 5172dbe114
5 changed files with 23 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/java/com/kunzisoft/keepass/activities/EntryEditActivity.kt
View File

@@ -97,7 +97,7 @@ import com.kunzisoft.keepass.view.asError
import com.kunzisoft.keepass.view.hideByFading
import com.kunzisoft.keepass.view.setTransparentNavigationBar
import com.kunzisoft.keepass.view.showActionErrorIfNeeded
import com.kunzisoft.keepass.view.updateLockPaddingLeft
import com.kunzisoft.keepass.view.updateLockPaddingStart
import com.kunzisoft.keepass.viewmodels.ColorPickerViewModel
import com.kunzisoft.keepass.viewmodels.EntryEditViewModel
import java.util.UUID
@@ -503,7 +503,7 @@ class EntryEditActivity : DatabaseLockActivity(),
}
// Padding if lock button visible
entryEditAddToolBar?.updateLockPaddingLeft()
entryEditAddToolBar?.updateLockPaddingStart()
mAttachmentFileBinderManager?.apply {
registerProgressTask()

4
app/src/main/java/com/kunzisoft/keepass/activities/GroupActivity.kt
View File

@@ -113,7 +113,7 @@ import com.kunzisoft.keepass.view.applyWindowInsets
import com.kunzisoft.keepass.view.hideByFading
import com.kunzisoft.keepass.view.setTransparentNavigationBar
import com.kunzisoft.keepass.view.showActionErrorIfNeeded
import com.kunzisoft.keepass.view.updateLockPaddingLeft
import com.kunzisoft.keepass.view.updateLockPaddingStart
import com.kunzisoft.keepass.viewmodels.GroupEditViewModel
import com.kunzisoft.keepass.viewmodels.GroupViewModel
import org.joda.time.Instant
@@ -1130,7 +1130,7 @@ class GroupActivity : DatabaseLockActivity(),
View.GONE
}
// Padding if lock button visible
toolbarAction?.updateLockPaddingLeft()
toolbarAction?.updateLockPaddingStart()
loadGroup()
}

4
app/src/main/java/com/kunzisoft/keepass/activities/IconPickerActivity.kt
View File

@@ -51,7 +51,7 @@ import com.kunzisoft.keepass.utils.getParcelableExtraCompat
import com.kunzisoft.keepass.utils.UriUtil.getDocumentFile
import com.kunzisoft.keepass.utils.UriUtil.openUrl
import com.kunzisoft.keepass.view.asError
import com.kunzisoft.keepass.view.updateLockPaddingLeft
import com.kunzisoft.keepass.view.updateLockPaddingStart
import com.kunzisoft.keepass.viewmodels.IconPickerViewModel
import kotlinx.coroutines.CoroutineScope
import kotlinx.coroutines.Deferred
@@ -212,7 +212,7 @@ class IconPickerActivity : DatabaseLockActivity() {
}
// Padding if lock button visible
toolbar.updateLockPaddingLeft()
toolbar.updateLockPaddingStart()
}
override fun onCreateOptionsMenu(menu: Menu?): Boolean {

4
app/src/main/java/com/kunzisoft/keepass/activities/KeyGeneratorActivity.kt
View File

@@ -18,7 +18,7 @@ import com.kunzisoft.keepass.R
import com.kunzisoft.keepass.activities.fragments.KeyGeneratorFragment
import com.kunzisoft.keepass.activities.legacy.DatabaseLockActivity
import com.kunzisoft.keepass.settings.PreferencesUtil
import com.kunzisoft.keepass.view.updateLockPaddingLeft
import com.kunzisoft.keepass.view.updateLockPaddingStart
import com.kunzisoft.keepass.viewmodels.KeyGeneratorViewModel
class KeyGeneratorActivity : DatabaseLockActivity() {
@@ -84,7 +84,7 @@ class KeyGeneratorActivity : DatabaseLockActivity() {
}
// Padding if lock button visible
toolbar.updateLockPaddingLeft()
toolbar.updateLockPaddingStart()
}
override fun onCreateOptionsMenu(menu: Menu?): Boolean {

23
app/src/main/java/com/kunzisoft/keepass/view/ViewUtil.kt
View File

@@ -59,6 +59,7 @@ import androidx.core.view.forEach
import androidx.core.view.isVisible
import androidx.core.view.updateLayoutParams
import androidx.core.view.updatePadding
import androidx.core.view.updatePaddingRelative
import com.google.android.material.appbar.CollapsingToolbarLayout
import com.google.android.material.snackbar.Snackbar
import com.kunzisoft.keepass.R
@@ -225,14 +226,20 @@ fun View.showByFading() {
}
}
fun View.updateLockPaddingLeft() {
updatePadding(resources.getDimensionPixelSize(
if (PreferencesUtil.showLockDatabaseButton(context)) {
R.dimen.lock_button_size
} else {
R.dimen.hidden_lock_button_size
}
))
fun View.updateLockPaddingStart() {
resources.getDimensionPixelSize(
if (PreferencesUtil.showLockDatabaseButton(context)) {
R.dimen.lock_button_size
} else {
R.dimen.hidden_lock_button_size
}
).let { lockPadding ->
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR1) {
updatePaddingRelative(lockPadding)
} else {
updatePadding(lockPadding)
}
}
}
fun Context.showActionErrorIfNeeded(result: ActionRunnable.Result) {