mirror of
https://github.com/Kunzisoft/KeePassDX.git
synced 2025-12-04 15:49:33 +01:00
#55 Fix dispatch event
This commit is contained in:
J-Jamet
@@ -39,7 +39,6 @@ import android.util.Log;
|
||||
import android.view.Menu;
|
||||
import android.view.MenuInflater;
|
||||
import android.view.MenuItem;
|
||||
import android.view.View;
|
||||
import android.widget.ImageView;
|
||||
|
||||
import com.keepassdroid.adapters.NodeAdapter;
|
||||
@@ -54,20 +53,20 @@ import com.keepassdroid.database.SortNodeEnum;
|
||||
import com.keepassdroid.database.edit.AddGroup;
|
||||
import com.keepassdroid.database.edit.DeleteEntry;
|
||||
import com.keepassdroid.database.edit.DeleteGroup;
|
||||
import com.keepassdroid.dialogs.ReadOnlyDialog;
|
||||
import com.keepassdroid.dialogs.AssignMasterKeyDialogFragment;
|
||||
import com.keepassdroid.dialogs.GroupEditDialogFragment;
|
||||
import com.keepassdroid.dialogs.IconPickerDialogFragment;
|
||||
import com.keepassdroid.dialogs.ReadOnlyDialog;
|
||||
import com.keepassdroid.password.PasswordActivity;
|
||||
import com.keepassdroid.search.SearchResultsActivity;
|
||||
import com.keepassdroid.tasks.ProgressTask;
|
||||
import com.keepassdroid.view.AddNodeView;
|
||||
import com.keepassdroid.view.AddNodeButtonView;
|
||||
import com.kunzisoft.keepass.R;
|
||||
|
||||
public class GroupActivity extends ListNodesActivity
|
||||
implements GroupEditDialogFragment.EditGroupListener, IconPickerDialogFragment.IconPickerListener {
|
||||
|
||||
private AddNodeView addNodeView;
|
||||
private AddNodeButtonView addNodeButtonView;
|
||||
|
||||
protected boolean addGroupEnabled = false;
|
||||
protected boolean addEntryEnabled = false;
|
||||
@@ -127,12 +126,12 @@ public class GroupActivity extends ListNodesActivity
|
||||
// Construct main view
|
||||
setContentView(getLayoutInflater().inflate(R.layout.list_nodes_with_add_button, null));
|
||||
|
||||
addNodeView = findViewById(R.id.add_node_button);
|
||||
addNodeView.enableAddGroup(addGroupEnabled);
|
||||
addNodeView.enableAddEntry(addEntryEnabled);
|
||||
addNodeButtonView = findViewById(R.id.add_node_button);
|
||||
addNodeButtonView.enableAddGroup(addGroupEnabled);
|
||||
addNodeButtonView.enableAddEntry(addEntryEnabled);
|
||||
// Hide when scroll
|
||||
RecyclerView recyclerView = findViewById(R.id.nodes_list);
|
||||
recyclerView.addOnScrollListener(addNodeView.hideButtonOnScrollListener());
|
||||
recyclerView.addOnScrollListener(addNodeButtonView.hideButtonOnScrollListener());
|
||||
|
||||
Toolbar toolbar = findViewById(R.id.toolbar);
|
||||
toolbar.setTitle("");
|
||||
@@ -141,13 +140,13 @@ public class GroupActivity extends ListNodesActivity
|
||||
if ( mCurrentGroup.getParent() != null )
|
||||
toolbar.setNavigationIcon(R.drawable.ic_arrow_up_white_24dp);
|
||||
|
||||
addNodeView.setAddGroupClickListener(v -> {
|
||||
addNodeButtonView.setAddGroupClickListener(v -> {
|
||||
editGroupDialogAction = EditGroupDialogAction.CREATION;
|
||||
GroupEditDialogFragment groupEditDialogFragment = new GroupEditDialogFragment();
|
||||
groupEditDialogFragment.show(getSupportFragmentManager(),
|
||||
GroupEditDialogFragment.TAG_CREATE_GROUP);
|
||||
});
|
||||
addNodeView.setAddEntryClickListener(v ->
|
||||
addNodeButtonView.setAddEntryClickListener(v ->
|
||||
EntryEditActivity.Launch(GroupActivity.this, mCurrentGroup));
|
||||
|
||||
setGroupTitle();
|
||||
@@ -276,14 +275,14 @@ public class GroupActivity extends ListNodesActivity
|
||||
protected void onResume() {
|
||||
super.onResume();
|
||||
// Show button on resume
|
||||
addNodeView.showButton();
|
||||
addNodeButtonView.showButton();
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void onStop() {
|
||||
super.onStop();
|
||||
// Hide button
|
||||
addNodeView.hideButton();
|
||||
addNodeButtonView.hideButton();
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -299,7 +298,7 @@ public class GroupActivity extends ListNodesActivity
|
||||
public void onSortSelected(SortNodeEnum sortNodeEnum, boolean ascending, boolean groupsBefore, boolean recycleBinBottom) {
|
||||
super.onSortSelected(sortNodeEnum, ascending, groupsBefore, recycleBinBottom);
|
||||
// Show button if hide after sort
|
||||
addNodeView.showButton();
|
||||
addNodeButtonView.showButton();
|
||||
}
|
||||
|
||||
protected void setGroupIcon() {
|
||||
|
||||
@@ -19,7 +19,9 @@
|
||||
*/
|
||||
package com.keepassdroid.view;
|
||||
|
||||
import android.annotation.SuppressLint;
|
||||
import android.content.Context;
|
||||
import android.graphics.Rect;
|
||||
import android.support.design.widget.FloatingActionButton;
|
||||
import android.support.v4.view.ViewCompat;
|
||||
import android.support.v4.view.ViewPropertyAnimatorListener;
|
||||
@@ -35,15 +37,15 @@ import android.widget.RelativeLayout;
|
||||
|
||||
import com.kunzisoft.keepass.R;
|
||||
|
||||
public class AddNodeView extends RelativeLayout {
|
||||
public class AddNodeButtonView extends RelativeLayout {
|
||||
|
||||
private enum State {
|
||||
OPEN, CLOSE
|
||||
}
|
||||
|
||||
private FloatingActionButton addButton;
|
||||
private View addEntry;
|
||||
private View addGroup;
|
||||
private FloatingActionButton addButtonView;
|
||||
private View addEntryView;
|
||||
private View addGroupView;
|
||||
|
||||
private boolean addEntryEnable;
|
||||
private boolean addGroupEnable;
|
||||
@@ -57,11 +59,11 @@ public class AddNodeView extends RelativeLayout {
|
||||
private ViewMenuAnimation viewMenuAnimationAddGroup;
|
||||
private long animationDuration;
|
||||
|
||||
public AddNodeView(Context context) {
|
||||
public AddNodeButtonView(Context context) {
|
||||
this(context, null);
|
||||
}
|
||||
|
||||
public AddNodeView(Context context, AttributeSet attrs) {
|
||||
public AddNodeButtonView(Context context, AttributeSet attrs) {
|
||||
super(context, attrs);
|
||||
inflate(context);
|
||||
}
|
||||
@@ -74,50 +76,63 @@ public class AddNodeView extends RelativeLayout {
|
||||
addEntryEnable = true;
|
||||
addGroupEnable = true;
|
||||
|
||||
addButton = findViewById(R.id.add_button);
|
||||
addEntry = findViewById(R.id.add_entry);
|
||||
addGroup = findViewById(R.id.add_group);
|
||||
addButtonView = findViewById(R.id.add_button);
|
||||
addEntryView = findViewById(R.id.add_entry);
|
||||
addGroupView = findViewById(R.id.add_group);
|
||||
|
||||
animationDuration = 300L;
|
||||
|
||||
viewButtonMenuAnimation = new AddButtonAnimation(addButton);
|
||||
viewMenuAnimationAddEntry = new ViewMenuAnimation(addEntry, 0L, 150L);
|
||||
viewMenuAnimationAddGroup = new ViewMenuAnimation(addGroup, 150L, 0L);
|
||||
viewButtonMenuAnimation = new AddButtonAnimation(addButtonView);
|
||||
viewMenuAnimationAddEntry = new ViewMenuAnimation(addEntryView, 0L, 150L);
|
||||
viewMenuAnimationAddGroup = new ViewMenuAnimation(addGroupView, 150L, 0L);
|
||||
|
||||
allowAction = true;
|
||||
state = State.CLOSE;
|
||||
|
||||
onAddButtonClickListener = v -> {
|
||||
if (allowAction) {
|
||||
startGlobalAnimation();
|
||||
}
|
||||
};
|
||||
addButton.setOnClickListener(onAddButtonClickListener);
|
||||
onAddButtonClickListener = v -> startGlobalAnimation();
|
||||
addButtonView.setOnClickListener(onAddButtonClickListener);
|
||||
|
||||
onAddButtonVisibilityChangedListener = new FloatingActionButton.OnVisibilityChangedListener() {
|
||||
@Override
|
||||
public void onHidden(FloatingActionButton fab) {
|
||||
super.onHidden(fab);
|
||||
addButton.setOnClickListener(null);
|
||||
addButton.setClickable(false);
|
||||
addButtonView.setOnClickListener(null);
|
||||
addButtonView.setClickable(false);
|
||||
}
|
||||
@Override
|
||||
public void onShown(FloatingActionButton fab) {
|
||||
super.onShown(fab);
|
||||
addButton.setOnClickListener(onAddButtonClickListener);
|
||||
addButtonView.setOnClickListener(onAddButtonClickListener);
|
||||
}
|
||||
};
|
||||
}
|
||||
|
||||
public RecyclerView.OnScrollListener hideButtonOnScrollListener() {
|
||||
@SuppressLint("ClickableViewAccessibility")
|
||||
@Override
|
||||
public boolean onTouchEvent(MotionEvent event) {
|
||||
Rect viewButtonRect = new Rect(),
|
||||
viewEntryRect = new Rect(),
|
||||
viewGroupRect = new Rect();
|
||||
addButtonView.getGlobalVisibleRect(viewButtonRect);
|
||||
addEntryView.getGlobalVisibleRect(viewEntryRect);
|
||||
addGroupView.getGlobalVisibleRect(viewGroupRect);
|
||||
if (! (viewButtonRect.contains((int) event.getRawX(), (int) event.getRawY())
|
||||
&& viewEntryRect.contains((int) event.getRawX(), (int) event.getRawY())
|
||||
&& viewGroupRect.contains((int) event.getRawX(), (int) event.getRawY()) )) {
|
||||
closeButtonIfOpen();
|
||||
}
|
||||
return super.onTouchEvent(event);
|
||||
}
|
||||
|
||||
public RecyclerView.OnScrollListener hideButtonOnScrollListener() {
|
||||
return new RecyclerView.OnScrollListener() {
|
||||
@Override
|
||||
public void onScrolled(RecyclerView recyclerView, int dx, int dy) {
|
||||
super.onScrolled(recyclerView, dx, dy);
|
||||
if (state.equals(State.CLOSE)) {
|
||||
if (dy > 0 && addButton.getVisibility() == View.VISIBLE) {
|
||||
if (dy > 0 && addButtonView.getVisibility() == View.VISIBLE) {
|
||||
hideButton();
|
||||
} else if (dy < 0 && addButton.getVisibility() != View.VISIBLE) {
|
||||
} else if (dy < 0 && addButtonView.getVisibility() != View.VISIBLE) {
|
||||
showButton();
|
||||
}
|
||||
}
|
||||
@@ -126,26 +141,20 @@ public class AddNodeView extends RelativeLayout {
|
||||
}
|
||||
|
||||
public void showButton() {
|
||||
addButton.show(onAddButtonVisibilityChangedListener);
|
||||
addButtonView.show(onAddButtonVisibilityChangedListener);
|
||||
}
|
||||
|
||||
public void hideButton() {
|
||||
addButton.hide(onAddButtonVisibilityChangedListener);
|
||||
addButtonView.hide(onAddButtonVisibilityChangedListener);
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean dispatchTouchEvent(MotionEvent ev) {
|
||||
/*
|
||||
TODO Dispatch event to close
|
||||
Rect viewRectG = new Rect();
|
||||
getGlobalVisibleRect(viewRectG);
|
||||
if (viewRectG.contains((int) ev.getRawX(), (int) ev.getRawY())) {
|
||||
if(allowAction && state.equals(State.OPEN)) {
|
||||
startGlobalAnimation();
|
||||
}
|
||||
/**
|
||||
* Start the animation to close the button
|
||||
*/
|
||||
public void closeButtonIfOpen() {
|
||||
if(state.equals(State.OPEN)) {
|
||||
startGlobalAnimation();
|
||||
}
|
||||
*/
|
||||
return super.dispatchTouchEvent(ev);
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -154,8 +163,8 @@ public class AddNodeView extends RelativeLayout {
|
||||
*/
|
||||
public void enableAddEntry(boolean enable) {
|
||||
this.addEntryEnable = enable;
|
||||
if (enable && addEntry != null && addEntry.getVisibility() != VISIBLE)
|
||||
addEntry.setVisibility(INVISIBLE);
|
||||
if (enable && addEntryView != null && addEntryView.getVisibility() != VISIBLE)
|
||||
addEntryView.setVisibility(INVISIBLE);
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -164,34 +173,36 @@ public class AddNodeView extends RelativeLayout {
|
||||
*/
|
||||
public void enableAddGroup(boolean enable) {
|
||||
this.addGroupEnable = enable;
|
||||
if (enable && addGroup != null && addGroup.getVisibility() != VISIBLE)
|
||||
addGroup.setVisibility(INVISIBLE);
|
||||
if (enable && addGroupView != null && addGroupView.getVisibility() != VISIBLE)
|
||||
addGroupView.setVisibility(INVISIBLE);
|
||||
}
|
||||
|
||||
public void setAddGroupClickListener(OnClickListener onClickListener) {
|
||||
if (addGroupEnable)
|
||||
addGroup.setOnClickListener(view -> {
|
||||
addGroupView.setOnClickListener(view -> {
|
||||
onClickListener.onClick(view);
|
||||
startGlobalAnimation();
|
||||
closeButtonIfOpen();
|
||||
});
|
||||
}
|
||||
|
||||
public void setAddEntryClickListener(OnClickListener onClickListener) {
|
||||
if (addEntryEnable)
|
||||
addEntry.setOnClickListener(view -> {
|
||||
addEntryView.setOnClickListener(view -> {
|
||||
onClickListener.onClick(view);
|
||||
startGlobalAnimation();
|
||||
closeButtonIfOpen();
|
||||
});
|
||||
}
|
||||
|
||||
private void startGlobalAnimation() {
|
||||
viewButtonMenuAnimation.startAnimation();
|
||||
if (allowAction) {
|
||||
viewButtonMenuAnimation.startAnimation();
|
||||
|
||||
if (addEntryEnable) {
|
||||
viewMenuAnimationAddEntry.startAnimation();
|
||||
}
|
||||
if (addGroupEnable) {
|
||||
viewMenuAnimationAddGroup.startAnimation();
|
||||
if (addEntryEnable) {
|
||||
viewMenuAnimationAddEntry.startAnimation();
|
||||
}
|
||||
if (addGroupEnable) {
|
||||
viewMenuAnimationAddGroup.startAnimation();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -265,10 +276,6 @@ public class AddNodeView extends RelativeLayout {
|
||||
this.delayOut = delayOut;
|
||||
}
|
||||
|
||||
ViewMenuAnimation(View view) {
|
||||
this(view, 0, 0);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onAnimationStart(View view) {}
|
||||
|
||||
@@ -301,7 +308,7 @@ public class AddNodeView extends RelativeLayout {
|
||||
} else {
|
||||
// The first time
|
||||
if (translation == 0) {
|
||||
translation = view.getY() + view.getHeight()/2 - addButton.getY() - addButton.getHeight()/2;
|
||||
translation = view.getY() + view.getHeight()/2 - addButtonView.getY() - addButtonView.getHeight()/2;
|
||||
view.setTranslationY(-translation);
|
||||
view.setTranslationX(view.getWidth()/3);
|
||||
view.setAlpha(0.0F);
|
||||
@@ -17,66 +17,63 @@
|
||||
You should have received a copy of the GNU General Public License
|
||||
along with KeePass DX. If not, see <http://www.gnu.org/licenses/>.
|
||||
-->
|
||||
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
<android.support.design.widget.CoordinatorLayout
|
||||
xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
xmlns:tools="http://schemas.android.com/tools"
|
||||
xmlns:app="http://schemas.android.com/apk/res-auto"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
xmlns:app="http://schemas.android.com/apk/res-auto">
|
||||
<android.support.design.widget.CoordinatorLayout
|
||||
android:layout_height="match_parent">
|
||||
|
||||
<android.support.design.widget.AppBarLayout
|
||||
android:id="@+id/app_bar"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent">
|
||||
android:layout_height="wrap_content"
|
||||
android:elevation="4dp"
|
||||
android:fitsSystemWindows="true">
|
||||
|
||||
<android.support.design.widget.AppBarLayout
|
||||
android:id="@+id/app_bar"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:elevation="4dp"
|
||||
android:fitsSystemWindows="true">
|
||||
|
||||
<android.support.design.widget.CollapsingToolbarLayout
|
||||
android:id="@+id/toolbar_layout"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
app:titleEnabled="false"
|
||||
app:contentScrim="?attr/colorPrimary"
|
||||
app:layout_scrollFlags="scroll|exitUntilCollapsed|snap">
|
||||
|
||||
<android.support.v7.widget.Toolbar xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
xmlns:app="http://schemas.android.com/apk/res-auto"
|
||||
xmlns:tools="http://schemas.android.com/tools"
|
||||
android:id="@+id/toolbar"
|
||||
android:title="@string/app_name"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="?attr/actionBarSize"
|
||||
android:background="?attr/colorPrimary"
|
||||
app:theme="?attr/toolbarAppearance"
|
||||
app:popupTheme="?attr/toolbarPopupAppearance"
|
||||
android:elevation="4dp"
|
||||
tools:targetApi="lollipop">
|
||||
<com.keepassdroid.view.GroupHeaderView
|
||||
android:id="@+id/group_header"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_alignParentLeft="true"
|
||||
android:layout_alignParentStart="true"
|
||||
android:layout_below="@+id/toolbar" />
|
||||
</android.support.v7.widget.Toolbar>
|
||||
|
||||
</android.support.design.widget.CollapsingToolbarLayout>
|
||||
</android.support.design.widget.AppBarLayout>
|
||||
|
||||
<android.support.v7.widget.RecyclerView android:id="@+id/nodes_list"
|
||||
app:layout_behavior="@string/appbar_scrolling_view_behavior"
|
||||
<android.support.design.widget.CollapsingToolbarLayout
|
||||
android:id="@+id/toolbar_layout"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:layout_below="@+id/toolbar" />
|
||||
</android.support.design.widget.CoordinatorLayout>
|
||||
app:titleEnabled="false"
|
||||
app:contentScrim="?attr/colorPrimary"
|
||||
app:layout_scrollFlags="scroll|exitUntilCollapsed|snap">
|
||||
|
||||
<com.keepassdroid.view.AddNodeView
|
||||
<android.support.v7.widget.Toolbar xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
xmlns:app="http://schemas.android.com/apk/res-auto"
|
||||
xmlns:tools="http://schemas.android.com/tools"
|
||||
android:id="@+id/toolbar"
|
||||
android:title="@string/app_name"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="?attr/actionBarSize"
|
||||
android:background="?attr/colorPrimary"
|
||||
app:theme="?attr/toolbarAppearance"
|
||||
app:popupTheme="?attr/toolbarPopupAppearance"
|
||||
android:elevation="4dp"
|
||||
tools:targetApi="lollipop">
|
||||
<com.keepassdroid.view.GroupHeaderView
|
||||
android:id="@+id/group_header"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_alignParentLeft="true"
|
||||
android:layout_alignParentStart="true"
|
||||
android:layout_below="@+id/toolbar" />
|
||||
</android.support.v7.widget.Toolbar>
|
||||
|
||||
</android.support.design.widget.CollapsingToolbarLayout>
|
||||
</android.support.design.widget.AppBarLayout>
|
||||
|
||||
<android.support.v7.widget.RecyclerView
|
||||
android:id="@+id/nodes_list"
|
||||
app:layout_behavior="@string/appbar_scrolling_view_behavior"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:layout_below="@+id/toolbar" />
|
||||
|
||||
<com.keepassdroid.view.AddNodeButtonView
|
||||
android:id="@+id/add_node_button"
|
||||
android:layout_alignParentBottom="true"
|
||||
android:layout_alignParentRight="true"
|
||||
android:layout_alignParentEnd="true"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content" />
|
||||
</RelativeLayout>
|
||||
android:layout_height="wrap_content"
|
||||
app:layout_anchor="@+id/nodes_list"
|
||||
app:layout_anchorGravity="right|bottom" />
|
||||
</android.support.design.widget.CoordinatorLayout>
|
||||
Reference in New Issue
Block a user