diff --git a/app/src/main/java/com/kunzisoft/keepass/view/AddNodeButtonView.kt b/app/src/main/java/com/kunzisoft/keepass/view/AddNodeButtonView.kt index b123fce8d..c69e5aae9 100644 --- a/app/src/main/java/com/kunzisoft/keepass/view/AddNodeButtonView.kt +++ b/app/src/main/java/com/kunzisoft/keepass/view/AddNodeButtonView.kt @@ -43,7 +43,11 @@ class AddNodeButtonView @JvmOverloads constructor(context: Context, var addButtonView: FloatingActionButton? = null private lateinit var addEntryView: View + private lateinit var textAddEntryView: View + private lateinit var fabAddEntryView: View private lateinit var addGroupView: View + private lateinit var textAddGroupView: View + private lateinit var fabAddGroupView: View private var addEntryEnable: Boolean = false private var addGroupEnable: Boolean = false @@ -77,7 +81,11 @@ class AddNodeButtonView @JvmOverloads constructor(context: Context, addButtonView = findViewById(R.id.add_button) addEntryView = findViewById(R.id.container_add_entry) + textAddEntryView = findViewById(R.id.text_add_entry) + fabAddEntryView = findViewById(R.id.fab_add_entry) addGroupView = findViewById(R.id.container_add_group) + textAddGroupView = findViewById(R.id.text_add_group) + fabAddGroupView = findViewById(R.id.fab_add_group) animationDuration = 300L @@ -189,24 +197,23 @@ class AddNodeButtonView @JvmOverloads constructor(context: Context, } } + private fun onButtonClickListener(onClickListener: OnClickListener) = + OnClickListener { view -> + onClickListener.onClick(view) + closeButtonIfOpen() + } + fun setAddGroupClickListener(onClickListener: OnClickListener) { - if (addGroupEnable) - addGroupView.setOnClickListener { view -> - onClickListener.onClick(view) - closeButtonIfOpen() - } + if (addGroupEnable) { + textAddGroupView.setOnClickListener(onButtonClickListener(onClickListener)) + fabAddGroupView.setOnClickListener(onButtonClickListener(onClickListener)) + } } fun setAddEntryClickListener(onClickListener: OnClickListener) { if (addEntryEnable) { - addEntryView.setOnClickListener { view -> - onClickListener.onClick(view) - closeButtonIfOpen() - } - addEntryView.setOnClickListener { view -> - onClickListener.onClick(view) - closeButtonIfOpen() - } + textAddEntryView.setOnClickListener(onButtonClickListener(onClickListener)) + fabAddEntryView.setOnClickListener(onButtonClickListener(onClickListener)) } } diff --git a/app/src/main/res/layout/activity_entry_edit.xml b/app/src/main/res/layout/activity_entry_edit.xml index 14ed20bd8..97c8eaafe 100644 --- a/app/src/main/res/layout/activity_entry_edit.xml +++ b/app/src/main/res/layout/activity_entry_edit.xml @@ -93,8 +93,9 @@ android:layout_height="wrap_content" android:contentDescription="@string/validate" android:src="@drawable/ic_check_white_24dp" - android:tint="?attr/colorOnAccentColor" + app:tint="?attr/colorOnAccentColor" app:fabSize="mini" + app:fabCustomSize="@dimen/button_small_size" app:layout_constraintTop_toTopOf="@+id/entry_edit_bottom_bar" app:layout_constraintBottom_toTopOf="@+id/screenshot_mode_banner" app:layout_constraintEnd_toEndOf="parent" diff --git a/app/src/main/res/layout/activity_file_selection.xml b/app/src/main/res/layout/activity_file_selection.xml index 96448a944..e953603bc 100644 --- a/app/src/main/res/layout/activity_file_selection.xml +++ b/app/src/main/res/layout/activity_file_selection.xml @@ -46,7 +46,8 @@ + android:layout_height="@dimen/toolbar_parallax_height" + android:background="?attr/colorPrimaryDark"> + android:paddingBottom="26dp"> diff --git a/app/src/main/res/layout/activity_group.xml b/app/src/main/res/layout/activity_group.xml index 9701e0534..7c3c34482 100644 --- a/app/src/main/res/layout/activity_group.xml +++ b/app/src/main/res/layout/activity_group.xml @@ -87,7 +87,7 @@ android:layout_gravity="center_vertical|start" android:visibility="gone" android:src="@drawable/ic_modified_white_12dp" - android:tint="?attr/textColorInverse" + app:tint="?attr/textColorInverse" android:contentDescription="@string/save"/> diff --git a/app/src/main/res/layout/activity_main_credential.xml b/app/src/main/res/layout/activity_main_credential.xml index 4e968b227..c960685b3 100644 --- a/app/src/main/res/layout/activity_main_credential.xml +++ b/app/src/main/res/layout/activity_main_credential.xml @@ -47,7 +47,7 @@ android:id="@+id/app_bar" android:layout_width="match_parent" android:layout_height="wrap_content" - android:background="?attr/colorPrimary"> + android:background="?attr/colorPrimaryDark"> + android:layout_height="wrap_content" + app:layout_collapseMode="parallax" + android:layout_gravity="top" + android:minHeight="192dp" + android:paddingTop="?attr/actionBarSize"> \ No newline at end of file diff --git a/app/src/main/res/layout/view_button_add_node.xml b/app/src/main/res/layout/view_button_add_node.xml index 5edb6a1ab..f2da52108 100644 --- a/app/src/main/res/layout/view_button_add_node.xml +++ b/app/src/main/res/layout/view_button_add_node.xml @@ -51,9 +51,11 @@ android:layout_marginRight="@dimen/image_button_margin" android:layout_marginEnd="@dimen/image_button_margin" android:src="@drawable/ic_key_white_24dp" - android:tint="?attr/colorOnAccentColor" android:contentDescription="@string/add_entry" + app:tint="?attr/colorOnAccentColor" + app:backgroundTint="?attr/colorAccent" app:fabSize="mini" + app:fabCustomSize="@dimen/button_small_size" app:useCompatPadding="true" /> @@ -83,9 +85,11 @@ android:layout_marginRight="@dimen/image_button_margin" android:layout_marginEnd="@dimen/image_button_margin" android:src="@drawable/ic_folder_white_24dp" - android:tint="?attr/colorOnAccentColor" android:contentDescription="@string/add_group" + app:tint="?attr/colorOnAccentColor" + app:backgroundTint="?attr/colorAccent" app:fabSize="mini" + app:fabCustomSize="@dimen/button_small_size" app:useCompatPadding="true" /> @@ -99,7 +103,7 @@ android:layout_alignParentBottom="true" android:contentDescription="@string/content_description_add_node" android:src="@drawable/ic_add_white_24dp" - android:tint="?attr/colorOnAccentColor" + app:tint="?attr/colorOnAccentColor" app:fabSize="normal" app:useCompatPadding="true" /> diff --git a/app/src/main/res/layout/view_button_lock.xml b/app/src/main/res/layout/view_button_lock.xml index 346798ba0..5ee6332f0 100644 --- a/app/src/main/res/layout/view_button_lock.xml +++ b/app/src/main/res/layout/view_button_lock.xml @@ -10,10 +10,11 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" app:fabSize="mini" + app:fabCustomSize="@dimen/button_small_size" android:layout_gravity="center" - android:layout_margin="9dp" + android:layout_margin="8dp" android:contentDescription="@string/lock" - android:visibility="gone" + android:visibility="visible" android:src="@drawable/ic_lock_white_padding_24dp" xmlns:app="http://schemas.android.com/apk/res-auto" /> \ No newline at end of file diff --git a/app/src/main/res/layout/view_main_credentials.xml b/app/src/main/res/layout/view_main_credentials.xml index 155268563..9c57596ea 100644 --- a/app/src/main/res/layout/view_main_credentials.xml +++ b/app/src/main/res/layout/view_main_credentials.xml @@ -26,8 +26,10 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_alignTop="@+id/password_input_layout" - android:layout_marginTop="22dp" + android:layout_alignBottom="@+id/password_input_layout" + android:layout_marginTop="4dp" android:contentDescription="@string/content_description_password_checkbox" + android:theme="@style/KeepassDXStyle.Switch" android:focusable="false" android:gravity="center_vertical" /> @@ -67,8 +69,10 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_alignTop="@+id/keyfile_selection" - android:layout_marginTop="22dp" + android:layout_alignBottom="@+id/keyfile_selection" + android:layout_marginTop="4dp" android:contentDescription="@string/content_description_keyfile_checkbox" + android:theme="@style/KeepassDXStyle.Switch" android:focusable="false" android:gravity="center_vertical" /> @@ -94,8 +98,10 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_alignTop="@+id/hardware_key_selection" - android:layout_marginTop="22dp" + android:layout_alignBottom="@+id/hardware_key_selection" + android:layout_marginTop="4dp" android:contentDescription="@string/content_description_hardware_key_checkbox" + android:theme="@style/KeepassDXStyle.Switch" android:focusable="false" android:gravity="center_vertical" /> diff --git a/app/src/main/res/values-v21/styles.xml b/app/src/main/res/values-v21/styles.xml index cc528f75e..859da687d 100644 --- a/app/src/main/res/values-v21/styles.xml +++ b/app/src/main/res/values-v21/styles.xml @@ -68,6 +68,6 @@ diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml index e87cea9f7..f91c16191 100644 --- a/app/src/main/res/values/dimens.xml +++ b/app/src/main/res/values/dimens.xml @@ -19,12 +19,13 @@ --> 18dp - 8dp + 4dp 22dp 8dp 15dp 144dp 6dp + 48dp 10dp 5dp 14dp diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index ea7428ab8..a8fe4f41b 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -20,7 +20,7 @@ - - @@ -247,7 +255,7 @@ - @@ -260,20 +268,20 @@ - - - - + + + - - + + + + - - +