diff --git a/Habitica/AndroidManifest.xml b/Habitica/AndroidManifest.xml index 00c0dd4eb..0866e4f55 100644 --- a/Habitica/AndroidManifest.xml +++ b/Habitica/AndroidManifest.xml @@ -2,7 +2,7 @@ diff --git a/Habitica/res/layout/fragment_recyclerview.xml b/Habitica/res/layout/fragment_recyclerview.xml index ffcb6a7bb..6c5da0794 100644 --- a/Habitica/res/layout/fragment_recyclerview.xml +++ b/Habitica/res/layout/fragment_recyclerview.xml @@ -12,7 +12,6 @@ android:scrollbarSize="3dp" android:scrollbarThumbVertical="@color/md_grey_500" android:scrollbars="vertical" - android:fitsSystemWindows="true" android:clipToPadding="false" android:paddingBottom="?attr/actionBarSize"/> diff --git a/Habitica/res/layout/fragment_refresh_recyclerview.xml b/Habitica/res/layout/fragment_refresh_recyclerview.xml index 6c97ba742..18f319647 100644 --- a/Habitica/res/layout/fragment_refresh_recyclerview.xml +++ b/Habitica/res/layout/fragment_refresh_recyclerview.xml @@ -17,7 +17,6 @@ android:scrollbarSize="3dp" android:scrollbarThumbVertical="@color/md_grey_500" android:scrollbars="vertical" - android:fitsSystemWindows="true" android:clipToPadding="false" android:paddingBottom="?attr/actionBarSize" /> diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/MainActivity.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/MainActivity.java index 30014e12d..31410143d 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/MainActivity.java +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/MainActivity.java @@ -1449,13 +1449,13 @@ public class MainActivity extends BaseActivity implements Action1, Ha switch (event.Task.type) { case Task.TYPE_DAILY: { dailyCheckUseCase.observable(new DailyCheckUseCase.RequestValues(event.Task, !event.Task.getCompleted())) - .subscribe(res -> EventBus.getDefault().post(new TaskUpdatedEvent(event.Task)), error -> { + .subscribe(new TaskScoringCallback(this, event.Task.getId()), error -> { }); } break; case Task.TYPE_TODO: { todoCheckUseCase.observable(new TodoCheckUseCase.RequestValues(event.Task, !event.Task.getCompleted())) - .subscribe(res -> EventBus.getDefault().post(new TaskUpdatedEvent(event.Task)), error -> { + .subscribe(new TaskScoringCallback(this, event.Task.getId()), error -> { }); } break; @@ -1465,14 +1465,14 @@ public class MainActivity extends BaseActivity implements Action1, Ha @Subscribe public void onEvent(ChecklistCheckedCommand event) { checklistCheckUseCase.observable(new ChecklistCheckUseCase.RequestValues(event.task.getId(), event.item.getId())) - .subscribe(res -> EventBus.getDefault().post(new TaskUpdatedEvent(event.task)), error -> { + .subscribe(new TaskUpdateCallback(), error -> { }); } @Subscribe public void onEvent(HabitScoreEvent event) { habitScoreUseCase.observable(new HabitScoreUseCase.RequestValues(event.habit, event.Up)) - .subscribe(res -> onTaskDataReceived(res, event.habit), error -> { + .subscribe(new TaskScoringCallback(this, event.habit.getId()), error -> { }); }