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

Minor style changes

Browse Source
This commit is contained in:
Alinson S. Xavier
2017-11-15 21:54:30 -06:00
parent ecf3086aef
commit 0dc46d02a4
2 changed files with 10 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -26,8 +26,8 @@ import org.isoron.uhabits.*;
import org.isoron.uhabits.activities.common.dialogs.*; import org.isoron.uhabits.activities.common.dialogs.*;
import org.isoron.uhabits.activities.habits.edit.*; import org.isoron.uhabits.activities.habits.edit.*;
import org.isoron.uhabits.core.models.*; import org.isoron.uhabits.core.models.*;
import org.isoron.uhabits.core.ui.callbacks.*;
import org.isoron.uhabits.core.ui.screens.habits.show.*; import org.isoron.uhabits.core.ui.screens.habits.show.*;
import org.isoron.uhabits.core.ui.callbacks.OnConfirmedCallback;
import javax.inject.*; import javax.inject.*;
@@ -56,19 +56,18 @@ public class ShowHabitScreen extends BaseScreen
@NonNull Habit habit, @NonNull Habit habit,
@NonNull ShowHabitRootView view, @NonNull ShowHabitRootView view,
@NonNull ShowHabitsMenu menu, @NonNull ShowHabitsMenu menu,
@NonNull @NonNull EditHabitDialogFactory editHabitDialogFactory,
EditHabitDialogFactory editHabitDialogFactory,
@NonNull ConfirmDeleteDialogFactory confirmDeleteDialogFactory, @NonNull ConfirmDeleteDialogFactory confirmDeleteDialogFactory,
@NonNull Lazy<ShowHabitBehavior> behavior) @NonNull Lazy<ShowHabitBehavior> behavior)
{ {
super(activity); super(activity);
this.confirmDeleteDialogFactory = confirmDeleteDialogFactory;
setMenu(menu); setMenu(menu);
setRootView(view); setRootView(view);
this.habit = habit; this.habit = habit;
this.behavior = behavior; this.behavior = behavior;
this.editHabitDialogFactory = editHabitDialogFactory; this.editHabitDialogFactory = editHabitDialogFactory;
this.confirmDeleteDialogFactory = confirmDeleteDialogFactory;
view.setController(this); view.setController(this);
} }
@@ -122,18 +121,19 @@ public class ShowHabitScreen extends BaseScreen
{ {
case COULD_NOT_EXPORT: case COULD_NOT_EXPORT:
showMessage(R.string.could_not_export); showMessage(R.string.could_not_export);
case HABIT_DELETED: case HABIT_DELETED:
showMessage(R.string.delete_habits_message); showMessage(R.string.delete_habits_message);
} }
} }
@Override @Override
public void showDeleteConfirmationScreen(OnConfirmedCallback callback) { public void showDeleteConfirmationScreen(@NonNull OnConfirmedCallback callback) {
activity.showDialog(confirmDeleteDialogFactory.create(callback)); activity.showDialog(confirmDeleteDialogFactory.create(callback));
} }
@Override @Override
public void endActivity() { public void close() {
activity.finish(); activity.finish();
} }
} }

10
uhabits-core/src/main/java/org/isoron/uhabits/core/ui/screens/habits/show/ShowHabitMenuBehavior.java
View File

@@ -21,11 +21,10 @@ package org.isoron.uhabits.core.ui.screens.habits.show;
import android.support.annotation.*; import android.support.annotation.*;
import org.isoron.uhabits.core.commands.CommandRunner; import org.isoron.uhabits.core.commands.*;
import org.isoron.uhabits.core.commands.DeleteHabitsCommand;
import org.isoron.uhabits.core.models.*; import org.isoron.uhabits.core.models.*;
import org.isoron.uhabits.core.tasks.*; import org.isoron.uhabits.core.tasks.*;
import org.isoron.uhabits.core.ui.callbacks.OnConfirmedCallback; import org.isoron.uhabits.core.ui.callbacks.*;
import java.io.*; import java.io.*;
import java.util.*; import java.util.*;
@@ -92,8 +91,7 @@ public class ShowHabitMenuBehavior
screen.showDeleteConfirmationScreen(() -> { screen.showDeleteConfirmationScreen(() -> {
commandRunner.execute(new DeleteHabitsCommand(habitList, selected), commandRunner.execute(new DeleteHabitsCommand(habitList, selected),
null); null);
screen.showMessage(Message.HABIT_DELETED); screen.close();
screen.endActivity();
}); });
} }
@@ -113,7 +111,7 @@ public class ShowHabitMenuBehavior
void showDeleteConfirmationScreen( void showDeleteConfirmationScreen(
@NonNull OnConfirmedCallback callback); @NonNull OnConfirmedCallback callback);
void endActivity(); void close();
} }
public interface System public interface System