sudoxreboot/habitica-android
1
0
Fork 0
mirror of https://github.com/sudoxnym/habitica-android.git synced 2026-05-21 05:09:00 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix task reordering

Browse source
This commit is contained in:
Phillip Thelen 2017-04-14 15:16:32 +02:00
parent 1050d87922
commit 90900858b3
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/preferences/PreferencesFragment.java
View file

@ -1,5 +1,6 @@
package com.habitrpg.android.habitica.ui.fragments.preferences;
import com.habitrpg.android.habitica.HabiticaBaseApplication;
import com.habitrpg.android.habitica.data.ApiClient;
import com.habitrpg.android.habitica.HabiticaApplication;
import com.habitrpg.android.habitica.R;
@ -74,7 +75,7 @@ public class PreferencesFragment extends BasePreferencesFragment implements
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
((HabiticaApplication) getActivity().getApplication()).getComponent().inject(this);
HabiticaBaseApplication.getComponent().inject(this);
context = getActivity();
String userID = getPreferenceManager().getSharedPreferences().getString(context.getString(R.string.SP_userID), null);

2
Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/tasks/TaskRecyclerViewFragment.java
View file

@ -200,7 +200,6 @@ public class TaskRecyclerViewFragment extends BaseFragment implements View.OnCli
}
public boolean onMove(RecyclerView recyclerView, RecyclerView.ViewHolder viewHolder, RecyclerView.ViewHolder target) {
swipeRefreshLayout.setEnabled(true);
if (mFromPosition == null) mFromPosition = viewHolder.getAdapterPosition();
((ItemTouchHelperAdapter) recyclerAdapter).onItemMove(viewHolder.getAdapterPosition(), target.getAdapterPosition());
return true;
@ -220,6 +219,7 @@ public class TaskRecyclerViewFragment extends BaseFragment implements View.OnCli
@Override
public void clearView(RecyclerView recyclerView, RecyclerView.ViewHolder viewHolder) {
super.clearView(recyclerView, viewHolder);
swipeRefreshLayout.setEnabled(true);
viewHolder.itemView.setBackgroundColor(Color.WHITE);
if (mFromPosition != null) {