mirrors/KeePassDX
1
0
Fork 0
mirror of https://github.com/Kunzisoft/KeePassDX.git synced 2025-04-05 05:47:36 +03:00
Code Issues Projects Releases Packages Wiki Activity

fix: Entry validation button not accessible with the keyboard open #1770

Browse source
This commit is contained in:
J-Jamet 2024-05-15 21:24:01 +02:00
parent f50a6a8416
commit ffa32a5501
4 changed files with 56 additions and 50 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/src/main/AndroidManifest.xml
View file

@ -145,7 +145,7 @@
android:configChanges="keyboardHidden" /> android:configChanges="keyboardHidden" />
<activity <activity
android:name="com.kunzisoft.keepass.activities.EntryEditActivity" android:name="com.kunzisoft.keepass.activities.EntryEditActivity"
android:windowSoftInputMode="adjustPan" /> android:windowSoftInputMode="adjustResize" />
<!-- About and Settings --> <!-- About and Settings -->
<activity <activity
android:name="com.kunzisoft.keepass.activities.AboutActivity" android:name="com.kunzisoft.keepass.activities.AboutActivity"

2
app/src/main/java/com/kunzisoft/keepass/activities/EntryEditActivity.kt
View file

@ -179,7 +179,7 @@ class EntryEditActivity : DatabaseLockActivity(),
// To apply fit window with transparency // To apply fit window with transparency
setTransparentNavigationBar(applyToStatusBar = true) { setTransparentNavigationBar(applyToStatusBar = true) {
container?.applyWindowInsets(WindowInsetPosition.TOP) container?.applyWindowInsets(WindowInsetPosition.TOP_BOTTOM_IME)
footer?.applyWindowInsets(WindowInsetPosition.BOTTOM) footer?.applyWindowInsets(WindowInsetPosition.BOTTOM)
} }

14
app/src/main/java/com/kunzisoft/keepass/view/ViewUtil.kt
View file

@ -350,9 +350,19 @@ fun View.applyWindowInsets(position: WindowInsetPosition = WindowInsetPosition.B
} }
} }
WindowInsetPosition.BOTTOM -> { WindowInsetPosition.BOTTOM -> {
val imeHeight = windowInsets.getInsets(WindowInsetsCompat.Type.ime()).bottom
if (view.layoutParams is ViewGroup.MarginLayoutParams) { if (view.layoutParams is ViewGroup.MarginLayoutParams) {
view.updateLayoutParams<ViewGroup.MarginLayoutParams> { view.updateLayoutParams<ViewGroup.MarginLayoutParams> {
bottomMargin = insets.bottom bottomMargin = if (imeHeight > 1) 0 else insets.bottom
}
}
}
WindowInsetPosition.TOP_BOTTOM_IME -> {
val imeHeight = windowInsets.getInsets(WindowInsetsCompat.Type.ime()).bottom
if (view.layoutParams is ViewGroup.MarginLayoutParams) {
view.updateLayoutParams<ViewGroup.MarginLayoutParams> {
topMargin = insets.top
bottomMargin = if (imeHeight > 1) imeHeight else 0
} }
} }
} }
@ -363,5 +373,5 @@ fun View.applyWindowInsets(position: WindowInsetPosition = WindowInsetPosition.B
} }
enum class WindowInsetPosition { enum class WindowInsetPosition {
TOP, BOTTOM, LEGIT_TOP TOP, BOTTOM, LEGIT_TOP, TOP_BOTTOM_IME
} }

88
app/src/main/res/layout/activity_entry_edit.xml
View file

@ -22,59 +22,55 @@
xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:importantForAutofill="noExcludeDescendants" android:importantForAutofill="noExcludeDescendants"
android:id="@+id/activity_entry_edit_container"
tools:targetApi="o" tools:targetApi="o"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:filterTouchesWhenObscured="true"> android:filterTouchesWhenObscured="true">
<com.kunzisoft.keepass.view.ToolbarSpecial
android:id="@+id/special_mode_view"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:layout_constraintTop_toTopOf="parent" />
<androidx.coordinatorlayout.widget.CoordinatorLayout <androidx.coordinatorlayout.widget.CoordinatorLayout
android:id="@+id/entry_edit_coordinator_layout" android:id="@+id/entry_edit_coordinator_layout"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent"> android:layout_height="0dp"
app:layout_constraintTop_toBottomOf="@+id/special_mode_view"
app:layout_constraintBottom_toBottomOf="parent">
<androidx.constraintlayout.widget.ConstraintLayout <androidx.core.widget.NestedScrollView
android:id="@+id/activity_entry_edit_container" android:id="@+id/entry_edit_scroll"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent"> android:layout_height="match_parent"
app:layout_constraintTop_toTopOf="parent"
<com.kunzisoft.keepass.view.ToolbarSpecial app:layout_constraintBottom_toBottomOf="parent"
android:id="@+id/special_mode_view" android:scrollbarStyle="insideOverlay"
android:scrollbars="none"
app:layout_behavior="@string/appbar_scrolling_view_behavior">
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="match_parent"
app:layout_constraintTop_toTopOf="parent" /> android:paddingTop="@dimen/card_view_margin_vertical"
android:paddingBottom="128dp">
<androidx.core.widget.NestedScrollView <androidx.appcompat.widget.AppCompatSpinner
android:id="@+id/entry_edit_scroll" android:id="@+id/entry_edit_template_selector"
android:layout_width="match_parent"
android:layout_height="0dp"
app:layout_constraintTop_toBottomOf="@+id/special_mode_view"
app:layout_constraintBottom_toBottomOf="parent"
android:scrollbarStyle="insideOverlay"
android:scrollbars="none"
app:layout_behavior="@string/appbar_scrolling_view_behavior">
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="wrap_content"
android:paddingTop="@dimen/card_view_margin_vertical" app:layout_constraintTop_toTopOf="parent" />
android:paddingBottom="128dp"> <androidx.fragment.app.FragmentContainerView
<androidx.appcompat.widget.AppCompatSpinner android:id="@+id/entry_edit_content"
android:id="@+id/entry_edit_template_selector" android:name="com.kunzisoft.keepass.activities.fragments.EntryEditFragment"
android:layout_width="match_parent" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
app:layout_constraintTop_toTopOf="parent" /> app:layout_constraintWidth_percent="@dimen/content_percent"
<androidx.fragment.app.FragmentContainerView app:layout_constraintStart_toStartOf="parent"
android:id="@+id/entry_edit_content" app:layout_constraintEnd_toEndOf="parent"
android:name="com.kunzisoft.keepass.activities.fragments.EntryEditFragment" app:layout_constraintTop_toBottomOf="@+id/entry_edit_template_selector"/>
android:layout_width="0dp" </androidx.constraintlayout.widget.ConstraintLayout>
android:layout_height="wrap_content" </androidx.core.widget.NestedScrollView>
app:layout_constraintWidth_percent="@dimen/content_percent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toBottomOf="@+id/entry_edit_template_selector"/>
</androidx.constraintlayout.widget.ConstraintLayout>
</androidx.core.widget.NestedScrollView>
</androidx.constraintlayout.widget.ConstraintLayout>
</androidx.coordinatorlayout.widget.CoordinatorLayout> </androidx.coordinatorlayout.widget.CoordinatorLayout>
@ -82,14 +78,14 @@
android:id="@+id/activity_entry_edit_footer" android:id="@+id/activity_entry_edit_footer"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
app:layout_constraintBottom_toBottomOf="parent"> app:layout_constraintBottom_toTopOf="@+id/screenshot_mode_banner">
<com.kunzisoft.keepass.view.ToolbarAction <com.kunzisoft.keepass.view.ToolbarAction
android:id="@+id/entry_edit_bottom_bar" android:id="@+id/entry_edit_bottom_bar"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="bottom" android:layout_gravity="bottom"
app:layout_constraintBottom_toTopOf="@+id/screenshot_mode_banner" /> app:layout_constraintBottom_toBottomOf="parent" />
<com.google.android.material.floatingactionbutton.FloatingActionButton <com.google.android.material.floatingactionbutton.FloatingActionButton
android:id="@+id/entry_edit_validate" android:id="@+id/entry_edit_validate"
@ -110,12 +106,12 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintBottom_toTopOf="@+id/screenshot_mode_banner"/> app:layout_constraintBottom_toBottomOf="parent"/>
<include layout="@layout/view_screenshot_mode_banner" />
</androidx.constraintlayout.widget.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>
<include layout="@layout/view_screenshot_mode_banner" />
<ProgressBar <ProgressBar
android:id="@+id/loading" android:id="@+id/loading"
android:layout_width="wrap_content" android:layout_width="wrap_content"