isoron/loop
1
1
Fork 0
mirror of https://github.com/iSoron/uhabits.git synced 2025-12-07 09:38:52 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'add-delete-button-to-stats' of git://github.com/derebaba/uhabits into pull/delete-button

Browse Source
This commit is contained in:
Alinson S. Xavier
2017-11-15 21:42:30 -06:00
parent 9d48b4bcdb 10be875b48
commit ecf3086aef
5 changed files with 56 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/ShowHabitScreen.java
View File

@@ -27,6 +27,7 @@ import org.isoron.uhabits.activities.common.dialogs.*;
import org.isoron.uhabits.activities.habits.edit.*;
import org.isoron.uhabits.core.models.*;
import org.isoron.uhabits.core.ui.screens.habits.show.*;
import org.isoron.uhabits.core.ui.callbacks.OnConfirmedCallback;
import javax.inject.*;
@@ -45,6 +46,9 @@ public class ShowHabitScreen extends BaseScreen
@NonNull
private final EditHabitDialogFactory editHabitDialogFactory;
@NonNull
private final ConfirmDeleteDialogFactory confirmDeleteDialogFactory;
private final Lazy<ShowHabitBehavior> behavior;
@Inject
@@ -53,10 +57,12 @@ public class ShowHabitScreen extends BaseScreen
@NonNull ShowHabitRootView view,
@NonNull ShowHabitsMenu menu,
@NonNull
EditHabitDialogFactory editHabitDialogFactory,
EditHabitDialogFactory editHabitDialogFactory,
@NonNull ConfirmDeleteDialogFactory confirmDeleteDialogFactory,
@NonNull Lazy<ShowHabitBehavior> behavior)
{
super(activity);
this.confirmDeleteDialogFactory = confirmDeleteDialogFactory;
setMenu(menu);
setRootView(view);
@@ -116,6 +122,18 @@ public class ShowHabitScreen extends BaseScreen
{
case COULD_NOT_EXPORT:
showMessage(R.string.could_not_export);
case HABIT_DELETED:
showMessage(R.string.delete_habits_message);
}
}
@Override
public void showDeleteConfirmationScreen(OnConfirmedCallback callback) {
activity.showDialog(confirmDeleteDialogFactory.create(callback));
}
@Override
public void endActivity() {
activity.finish();
}
}

4
uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/ShowHabitsMenu.java
View File

@@ -57,6 +57,10 @@ public class ShowHabitsMenu extends BaseMenu
behavior.get().onExportCSV();
return true;
case R.id.action_delete:
behavior.get().onDeleteHabit();
return true;
default:
return false;
}

5
uhabits-android/src/main/res/menu/show_habit.xml
View File

@@ -26,6 +26,11 @@
android:title="@string/export"
app:showAsAction="never"/>
<item
android:id="@+id/action_delete"
android:title="@string/delete"
app:showAsAction="never"/>
<item
android:id="@+id/action_edit_habit"
android:icon="?iconEdit"