Revert "Temporary check in"

This reverts commit 7c85786d5c.
pull/258/head
Rechee Jozil 9 years ago
parent 7c85786d5c
commit ef62afb07e

@ -24,13 +24,9 @@ import android.os.*;
import org.isoron.uhabits.*; import org.isoron.uhabits.*;
import org.isoron.uhabits.activities.*; import org.isoron.uhabits.activities.*;
import org.isoron.uhabits.activities.habits.list.model.*; import org.isoron.uhabits.activities.habits.list.model.*;
import org.isoron.uhabits.models.Habit;
import org.isoron.uhabits.preferences.*; import org.isoron.uhabits.preferences.*;
import org.isoron.uhabits.utils.*; import org.isoron.uhabits.utils.*;
import java.util.ArrayList;
import java.util.List;
/** /**
* Activity that allows the user to see and modify the list of habits. * Activity that allows the user to see and modify the list of habits.
*/ */
@ -61,6 +57,7 @@ public class ListHabitsActivity extends BaseActivity
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
HabitsApplication app = (HabitsApplication) getApplicationContext(); HabitsApplication app = (HabitsApplication) getApplicationContext();
component = DaggerListHabitsComponent component = DaggerListHabitsComponent
.builder() .builder()
.appComponent(app.getComponent()) .appComponent(app.getComponent())
@ -85,31 +82,10 @@ public class ListHabitsActivity extends BaseActivity
midnightTimer = component.getMidnightTimer(); midnightTimer = component.getMidnightTimer();
if(savedInstanceState != null){
long[] selected = savedInstanceState.getLongArray("selected");
if(selected != null){
adapter.selectSavedHabits(selected);
}
}
setScreen(screen); setScreen(screen);
controller.onStartup(); controller.onStartup();
} }
@Override
protected void onSaveInstanceState (Bundle outState){
super.onSaveInstanceState(outState);
List<Habit> selected = adapter.getSelected();
if(selected.size() != 0){
long[] ids = new long[selected.size()];
for(int i = 0; i < selected.size(); i++){
ids[i] = selected.get(i).getId();
}
outState.putLongArray("selected", ids);
}
}
@Override @Override
protected void onPause() protected void onPause()
{ {

@ -19,8 +19,6 @@
package org.isoron.uhabits.activities.habits.list.model; package org.isoron.uhabits.activities.habits.list.model;
import android.content.res.Resources;
import android.content.res.Resources.NotFoundException;
import android.support.annotation.*; import android.support.annotation.*;
import android.support.v7.widget.*; import android.support.v7.widget.*;
import android.view.*; import android.view.*;
@ -307,17 +305,4 @@ public class HabitCardListAdapter
else selected.remove(h); else selected.remove(h);
notifyDataSetChanged(); notifyDataSetChanged();
} }
public void addSelectedHabit(Habit habitToSelect){
selected.add(habitToSelect);
notifyDataSetChanged();
}
public void selectSavedHabits(long[] selectedIDs) throws NotFoundException {
for(long id : selectedIDs)
{
Habit selectedHabit = cache.getHabitById(id);
addSelectedHabit(selectedHabit);
}
}
} }

@ -19,7 +19,6 @@
package org.isoron.uhabits.activities.habits.list.model; package org.isoron.uhabits.activities.habits.list.model;
import android.content.res.Resources;
import android.support.annotation.*; import android.support.annotation.*;
import org.isoron.uhabits.*; import org.isoron.uhabits.*;
@ -103,16 +102,6 @@ public class HabitCardListCache implements CommandRunner.Listener
return data.habits.get(position); return data.habits.get(position);
} }
public Habit getHabitById(long id){
for(Habit habit: data.habits){
if(habit.getId() == id){
return habit;
}
}
throw new Resources.NotFoundException("Habit not found.");
}
public int getHabitCount() public int getHabitCount()
{ {
return data.habits.size(); return data.habits.size();

Loading…
Cancel
Save