Skip to content

Commit 213a00a

Browse files
committed
Close drawer on back button pressed.
1 parent b7b659a commit 213a00a

File tree

2 files changed

+8
-1
lines changed

2 files changed

+8
-1
lines changed

Habitica/assets/paperboy/changelog.json

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,10 @@
2929
{
3030
"type": "F",
3131
"title": "Quest-Text can now display the HTML correctly"
32+
},
33+
{
34+
"type": "N",
35+
"title": "Task filter drawer now closes when back button is pressed"
3236
}
3337
]
3438
},

Habitica/src/com/habitrpg/android/habitica/MainActivity.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
import android.support.v7.app.AppCompatActivity;
1616
import android.support.v7.widget.Toolbar;
1717
import android.util.Log;
18+
import android.view.Gravity;
1819
import android.view.KeyEvent;
1920
import android.view.Menu;
2021
import android.view.View;
@@ -449,6 +450,8 @@ public void setActiveFragment(BaseFragment fragment) {
449450
public void onBackPressed() {
450451
if (drawer.isDrawerOpen()) {
451452
drawer.closeDrawer();
453+
} else if (drawer.getDrawerLayout().isDrawerOpen(Gravity.RIGHT)) {
454+
drawer.getDrawerLayout().closeDrawer(Gravity.RIGHT);
452455
} else {
453456
super.onBackPressed();
454457
}
@@ -570,7 +573,7 @@ public void failure(RetrofitError error) {
570573
}
571574

572575

573-
public void onEvent(final DeleteTaskCommand cmd){
576+
public void onEvent(final DeleteTaskCommand cmd) {
574577
mAPIHelper.apiService.deleteTask(cmd.TaskIdToDelete, new Callback<Void>() {
575578
@Override
576579
public void success(Void aVoid, Response response) {

0 commit comments

Comments
 (0)