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

fix: Breadcrumb and buttons

Browse Source
This commit is contained in:
J-Jamet
2023-07-24 09:47:17 +02:00
parent b1d4310b93
commit fa2a79bc6c
3 changed files with 39 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -133,7 +133,6 @@ class GroupActivity : DatabaseLockActivity(),
private var databaseNameView: TextView? = null
private var searchView: SearchView? = null
private var searchFiltersView: SearchFiltersView? = null
private var toolbarBreadcrumb: Toolbar? = null
private var toolbarAction: ToolbarAction? = null
private var numberChildrenView: TextView? = null
private var addNodeButtonView: AddNodeButtonView? = null
@@ -270,7 +269,6 @@ class GroupActivity : DatabaseLockActivity(),
databaseColorView = findViewById(R.id.database_color)
databaseNameView = findViewById(R.id.database_name)
searchFiltersView = findViewById(R.id.search_filters)
toolbarBreadcrumb = findViewById(R.id.toolbar_breadcrumb)
breadcrumbListView = findViewById(R.id.breadcrumb_list)
toolbarAction = findViewById(R.id.toolbar_action)
lockView = findViewById(R.id.lock_button)
@@ -1211,11 +1209,11 @@ class GroupActivity : DatabaseLockActivity(),
}
}
if (it.isActionViewExpanded) {
toolbarBreadcrumb?.visibility = View.GONE
breadcrumbListView?.visibility = View.GONE
searchFiltersView?.visibility = View.VISIBLE
} else {
searchFiltersView?.visibility = View.GONE
toolbarBreadcrumb?.visibility = View.VISIBLE
breadcrumbListView?.visibility = View.VISIBLE
}
mLockSearchListeners = false
}

50
app/src/main/res/layout/activity_file_selection.xml
View File

@@ -132,37 +132,49 @@
app:layout_behavior="@string/appbar_scrolling_view_behavior"/>
</androidx.coordinatorlayout.widget.CoordinatorLayout>
<LinearLayout
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/file_selection_buttons_container"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:layout_constraintBottom_toTopOf="@+id/screenshot_mode_banner"
android:background="?attr/colorSurface"
android:orientation="horizontal"
android:weightSum="2">
android:background="?attr/colorSurface">
<androidx.constraintlayout.widget.Guideline
android:id="@+id/guideline_buttons"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="vertical"
app:layout_constraintGuide_percent="0.5" />
<Button
android:id="@+id/create_database_button"
android:layout_width="0dp"
android:layout_height="wrap_content"
app:icon="@drawable/ic_database_plus_white_24dp"
app:iconGravity="start"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toStartOf="@+id/guideline_buttons"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="parent"
android:focusable="true"
style="@style/KeepassDXStyle.Button.Secondary"
android:text="@string/create_keepass_file"/>
<Button
android:id="@+id/open_database_button"
android:layout_width="wrap_content"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:text="@string/select_database_file"
app:icon="@drawable/ic_folder_white_24dp"
app:iconGravity="start"
android:layout_weight="1"
app:layout_constraintStart_toEndOf="@+id/create_database_button"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.5"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="parent"
android:focusable="true"
style="@style/KeepassDXStyle.Button.Secondary"/>
<Button
android:id="@+id/create_database_button"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:icon="@drawable/ic_database_plus_white_24dp"
app:iconGravity="start"
android:layout_weight="1"
android:focusable="true"
style="@style/KeepassDXStyle.Button.Primary"
android:text="@string/create_keepass_file"/>
</LinearLayout>
style="@style/KeepassDXStyle.Button.Primary"/>
</androidx.constraintlayout.widget.ConstraintLayout>
<include layout="@layout/view_screenshot_mode_banner" />
</androidx.constraintlayout.widget.ConstraintLayout>

16
app/src/main/res/layout/activity_group.xml
View File

@@ -105,17 +105,13 @@
android:layout_height="wrap_content"
app:layout_scrollFlags="scroll|snap|enterAlways">
<com.google.android.material.appbar.MaterialToolbar
android:id="@+id/toolbar_breadcrumb"
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/breadcrumb_list"
android:layout_width="match_parent"
android:layout_height="wrap_content">
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/breadcrumb_list"
android:layout_width="match_parent"
android:layout_height="match_parent"
app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
android:orientation="horizontal" />
</com.google.android.material.appbar.MaterialToolbar>
android:layout_height="64dp"
android:paddingHorizontal="12dp"
app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
android:orientation="horizontal" />
<com.kunzisoft.keepass.view.SearchFiltersView
android:id="@+id/search_filters"