Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

FIXED #255, Backpress should deselect any selected item if any #295

Merged
merged 1 commit into from
Dec 13, 2016
Merged

FIXED #255, Backpress should deselect any selected item if any #295

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 26 additions & 6 deletions source-code/app/src/main/java/org/buildmlearn/toolkit/fragment/DraftsFragment.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
import android.support.v7.app.AlertDialog;
import android.support.v7.app.AppCompatActivity;
import android.util.Log;
import android.view.KeyEvent;
import android.view.LayoutInflater;
import android.view.Menu;
import android.view.MenuItem;
Expand Down Expand Up @@ -117,6 +118,21 @@ public boolean onItemLongClick(AdapterView<?> parent, View view, int position, l
return true;
}
});

getView().setFocusableInTouchMode(true);
getView().requestFocus();
getView().setOnKeyListener(new View.OnKeyListener() {
@Override
public boolean onKey(View v, int keyCode, KeyEvent event) {
if (keyCode == KeyEvent.KEYCODE_BACK) {
if (mAdapter.selectedPositionsSize() > 0) {
unselectAll();
return true;
}
}
return false;
}
});
}

/**
Expand Down Expand Up @@ -316,12 +332,7 @@ public void onClick(View v) {
break;

case R.id.action_unselect_all:
for(int i=0;i<mAdapter.getCount();i++)
if(mAdapter.isPositionSelected(i)) {
mListView.getChildAt(i).setBackgroundColor(0);
mAdapter.removeSelectedPosition(i);
}
restoreColorScheme();
unselectAll();
break;

case R.id.action_delete_all:
Expand Down Expand Up @@ -349,6 +360,15 @@ public void onClick(View v) {
return super.onOptionsItemSelected(item);
}

private void unselectAll() {
for (int i = 0; i < mAdapter.getCount(); i++)
if (mAdapter.isPositionSelected(i)) {
mListView.getChildAt(i).setBackgroundColor(0);
mAdapter.removeSelectedPosition(i);
}
restoreColorScheme();
}

/**
* @brief Removes selected project item
*/
Expand Down
31 changes: 25 additions & 6 deletions source-code/app/src/main/java/org/buildmlearn/toolkit/fragment/LoadApkFragment.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,6 +147,21 @@ public boolean onItemLongClick(AdapterView<?> parent, View view, int position, l
return true;
}
});

getView().setFocusableInTouchMode(true);
getView().requestFocus();
getView().setOnKeyListener(new View.OnKeyListener() {
@Override
public boolean onKey(View v, int keyCode, KeyEvent event) {
if (keyCode == KeyEvent.KEYCODE_BACK) {
if (mAdapter.selectedPositionsSize() > 0) {
unselectAll();
return true;
}
}
return false;
}
});
}

/**
Expand Down Expand Up @@ -409,12 +424,7 @@ public boolean onKey(View v, int keyCode, KeyEvent event) {
break;

case R.id.action_unselect_all:
for(int i=0;i<mAdapter.getCount();i++)
if(mAdapter.isPositionSelected(i)) {
mListView.getChildAt(i).setBackgroundColor(0);
mAdapter.removeSelectedPosition(i);
}
restoreColorScheme();
unselectAll();
break;

default: //do nothing
Expand All @@ -423,6 +433,15 @@ public boolean onKey(View v, int keyCode, KeyEvent event) {
return super.onOptionsItemSelected(item);
}

public void unselectAll() {
for (int i = 0; i < mAdapter.getCount(); i++)
if (mAdapter.isPositionSelected(i)) {
mListView.getChildAt(i).setBackgroundColor(0);
mAdapter.removeSelectedPosition(i);
}
restoreColorScheme();
}

/**
* @brief Removes selected apk item
*/
Expand Down
31 changes: 25 additions & 6 deletions source-code/app/src/main/java/org/buildmlearn/toolkit/fragment/LoadProjectFragment.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,6 +162,21 @@ public boolean onItemLongClick(AdapterView<?> parent, View view, int position, l
return true;
}
});

getView().setFocusableInTouchMode(true);
getView().requestFocus();
getView().setOnKeyListener(new View.OnKeyListener() {
@Override
public boolean onKey(View v, int keyCode, KeyEvent event) {
if (keyCode == KeyEvent.KEYCODE_BACK) {
if (mAdapter.selectedPositionsSize() > 0) {
unselectAll();
return true;
}
}
return false;
}
});
}

/**
Expand Down Expand Up @@ -449,12 +464,7 @@ public boolean onKey(View v, int keyCode, KeyEvent event) {
break;

case R.id.action_unselect_all:
for(int i=0;i<mAdapter.getCount();i++)
if(mAdapter.isPositionSelected(i)) {
mListView.getChildAt(i).setBackgroundColor(0);
mAdapter.removeSelectedPosition(i);
}
restoreColorScheme();
unselectAll();
break;

default: //do nothing
Expand All @@ -463,6 +473,15 @@ public boolean onKey(View v, int keyCode, KeyEvent event) {
return super.onOptionsItemSelected(item);
}

private void unselectAll() {
for (int i = 0; i < mAdapter.getCount(); i++)
if (mAdapter.isPositionSelected(i)) {
mListView.getChildAt(i).setBackgroundColor(0);
mAdapter.removeSelectedPosition(i);
}
restoreColorScheme();
}

/**
* @brief Removes selected project item
*/
Expand Down