Create org.isoron.androidbase package

uhabits-android/src/androidTest/java/org/isoron/uhabits/AndroidTestComponent.java

@@ -20,6 +20,7 @@
 package org.isoron.uhabits;
 
 
+import org.isoron.androidbase.*;
 import org.isoron.uhabits.models.sqlite.*;
 import org.isoron.uhabits.tasks.*;
 

uhabits-android/src/androidTest/java/org/isoron/uhabits/BaseAndroidTest.java

@@ -27,6 +27,7 @@ import android.support.annotation.*;
 import android.support.test.*;
 import android.util.*;
 
+import org.isoron.androidbase.*;
 import org.isoron.uhabits.models.*;
 import org.isoron.uhabits.preferences.*;
 import org.isoron.uhabits.tasks.*;

uhabits-android/src/androidTest/java/org/isoron/uhabits/HabitLoggerTest.java

@@ -23,8 +23,8 @@ import android.os.*;
 import android.support.test.runner.*;
 import android.test.suitebuilder.annotation.*;
 
+import org.isoron.androidbase.activities.*;
 import org.isoron.uhabits.models.*;
-import org.isoron.uhabits.activities.*;
 import org.junit.*;
 import org.junit.runner.*;
 

uhabits-android/src/androidTest/java/org/isoron/uhabits/HabitsApplicationTest.java

@@ -22,7 +22,7 @@ package org.isoron.uhabits;
 import android.support.test.runner.*;
 import android.test.suitebuilder.annotation.*;
 
-import org.isoron.uhabits.activities.*;
+import org.isoron.androidbase.activities.*;
 import org.junit.*;
 import org.junit.runner.*;
 

uhabits-android/src/main/java/org/isoron/androidbase/AppContext.java

@@ -17,7 +17,7 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.isoron.uhabits;
+package org.isoron.androidbase;
 
 import java.lang.annotation.*;
 

uhabits-android/src/main/java/org/isoron/androidbase/AppModule.java

@@ -17,7 +17,7 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.isoron.uhabits;
+package org.isoron.androidbase;
 
 import android.content.*;
 

uhabits-android/src/main/java/org/isoron/androidbase/activities/ActivityContext.java

@@ -17,7 +17,7 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.isoron.uhabits.activities;
+package org.isoron.androidbase.activities;
 
 import java.lang.annotation.*;
 

uhabits-android/src/main/java/org/isoron/androidbase/activities/ActivityModule.java

@@ -17,7 +17,7 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.isoron.uhabits.activities;
+package org.isoron.androidbase.activities;
 
 import android.content.*;
 

uhabits-android/src/main/java/org/isoron/androidbase/activities/ActivityScope.java

@@ -17,7 +17,7 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.isoron.uhabits.activities;
+package org.isoron.androidbase.activities;
 
 import javax.inject.*;
 

uhabits-android/src/main/java/org/isoron/androidbase/activities/BaseActivity.java

@@ -17,7 +17,7 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.isoron.uhabits.activities;
+package org.isoron.androidbase.activities;
 
 import android.content.*;
 import android.os.*;
@@ -26,6 +26,7 @@ import android.support.v7.app.*;
 import android.view.*;
 
 import org.isoron.uhabits.*;
+import org.isoron.uhabits.activities.*;
 
 import static android.R.anim.fade_in;
 import static android.R.anim.fade_out;

uhabits-android/src/main/java/org/isoron/androidbase/activities/BaseExceptionHandler.java

@@ -17,7 +17,7 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.isoron.uhabits.activities;
+package org.isoron.androidbase.activities;
 
 import android.support.annotation.*;
 

uhabits-android/src/main/java/org/isoron/androidbase/activities/BaseMenu.java

@@ -17,7 +17,7 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.isoron.uhabits.activities;
+package org.isoron.androidbase.activities;
 
 import android.support.annotation.*;
 import android.view.*;

uhabits-android/src/main/java/org/isoron/androidbase/activities/BaseRootView.java

@@ -17,7 +17,7 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.isoron.uhabits.activities;
+package org.isoron.androidbase.activities;
 
 import android.content.*;
 import android.support.annotation.*;
@@ -27,6 +27,7 @@ import android.view.*;
 import android.widget.*;
 
 import org.isoron.uhabits.*;
+import org.isoron.uhabits.activities.*;
 import org.isoron.uhabits.utils.*;
 
 import static android.os.Build.VERSION.*;

uhabits-android/src/main/java/org/isoron/androidbase/activities/BaseScreen.java

@@ -17,7 +17,7 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.isoron.uhabits.activities;
+package org.isoron.androidbase.activities;
 
 import android.content.*;
 import android.graphics.*;

uhabits-android/src/main/java/org/isoron/androidbase/activities/BaseSelectionMenu.java

@@ -17,7 +17,7 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.isoron.uhabits.activities;
+package org.isoron.androidbase.activities;
 
 import android.support.annotation.*;
 import android.support.v7.view.ActionMode;

uhabits-android/src/main/java/org/isoron/androidbase/activities/BaseSystem.java

@@ -17,7 +17,7 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.isoron.uhabits.activities;
+package org.isoron.androidbase.activities;
 
 import android.content.*;
 import android.os.*;

uhabits-android/src/main/java/org/isoron/uhabits/AppComponent.java

@@ -21,6 +21,7 @@ package org.isoron.uhabits;
 
 import android.content.*;
 
+import org.isoron.androidbase.*;
 import org.isoron.uhabits.activities.habits.list.model.*;
 import org.isoron.uhabits.commands.*;
 import org.isoron.uhabits.intents.*;

uhabits-android/src/main/java/org/isoron/uhabits/HabitsApplication.java

@@ -24,6 +24,7 @@ import android.content.*;
 
 import com.activeandroid.*;
 
+import org.isoron.androidbase.*;
 import org.isoron.uhabits.models.sqlite.*;
 import org.isoron.uhabits.notifications.*;
 import org.isoron.uhabits.preferences.*;

uhabits-android/src/main/java/org/isoron/uhabits/activities/ActivityComponent.java

@@ -19,6 +19,7 @@
 
 package org.isoron.uhabits.activities;
 
+import org.isoron.androidbase.activities.*;
 import org.isoron.uhabits.*;
 import org.isoron.uhabits.activities.common.dialogs.*;
 

uhabits-android/src/main/java/org/isoron/uhabits/activities/ThemeSwitcher.java

@@ -21,6 +21,7 @@ package org.isoron.uhabits.activities;
 
 import android.support.annotation.*;
 
+import org.isoron.androidbase.activities.*;
 import org.isoron.uhabits.*;
 import org.isoron.uhabits.preferences.*;
 

uhabits-android/src/main/java/org/isoron/uhabits/activities/about/AboutActivity.java

@@ -21,7 +21,7 @@ package org.isoron.uhabits.activities.about;
 
 import android.os.*;
 
-import org.isoron.uhabits.activities.*;
+import org.isoron.androidbase.activities.*;
 import org.isoron.uhabits.intents.*;
 
 /**

uhabits-android/src/main/java/org/isoron/uhabits/activities/about/AboutRootView.java

@@ -24,10 +24,10 @@ import android.support.annotation.*;
 import android.support.v7.widget.Toolbar;
 import android.widget.*;
 
+import org.isoron.androidbase.activities.*;
 import org.isoron.uhabits.BuildConfig;
 import org.isoron.uhabits.*;
 import org.isoron.uhabits.R;
-import org.isoron.uhabits.activities.*;
 import org.isoron.uhabits.intents.*;
 import org.isoron.uhabits.preferences.*;
 import org.isoron.uhabits.utils.*;

uhabits-android/src/main/java/org/isoron/uhabits/activities/common/dialogs/ColorPickerDialogFactory.java

@@ -21,8 +21,8 @@ package org.isoron.uhabits.activities.common.dialogs;
 
 import android.content.*;
 
+import org.isoron.androidbase.activities.*;
 import org.isoron.uhabits.*;
-import org.isoron.uhabits.activities.*;
 import org.isoron.uhabits.utils.*;
 
 import javax.inject.*;

uhabits-android/src/main/java/org/isoron/uhabits/activities/common/dialogs/ConfirmDeleteDialog.java

@@ -24,8 +24,8 @@ import android.support.v7.app.*;
 
 import com.google.auto.factory.*;
 
+import org.isoron.androidbase.activities.*;
 import org.isoron.uhabits.R;
-import org.isoron.uhabits.activities.*;
 
 import butterknife.*;
 

uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/edit/EditHabitDialog.java

@@ -28,9 +28,9 @@ import android.view.*;
 
 import com.android.datetimepicker.time.*;
 
+import org.isoron.androidbase.activities.*;
 import org.isoron.uhabits.*;
 import org.isoron.uhabits.R;
-import org.isoron.uhabits.activities.*;
 import org.isoron.uhabits.activities.common.dialogs.*;
 import org.isoron.uhabits.activities.habits.edit.views.*;
 import org.isoron.uhabits.commands.*;

uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/ListHabitsActivity.java

@@ -22,6 +22,7 @@ package org.isoron.uhabits.activities.habits.list;
 import android.content.*;
 import android.os.*;
 
+import org.isoron.androidbase.activities.*;
 import org.isoron.uhabits.*;
 import org.isoron.uhabits.activities.*;
 import org.isoron.uhabits.activities.habits.list.model.*;

uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/ListHabitsComponent.java

@@ -19,8 +19,8 @@
 
 package org.isoron.uhabits.activities.habits.list;
 
+import org.isoron.androidbase.activities.*;
 import org.isoron.uhabits.*;
-import org.isoron.uhabits.activities.*;
 import org.isoron.uhabits.activities.habits.list.controllers.*;
 import org.isoron.uhabits.activities.habits.list.model.*;
 import org.isoron.uhabits.utils.*;

uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/ListHabitsController.java

@@ -21,8 +21,8 @@ package org.isoron.uhabits.activities.habits.list;
 
 import android.support.annotation.*;
 
+import org.isoron.androidbase.activities.*;
 import org.isoron.uhabits.*;
-import org.isoron.uhabits.activities.*;
 import org.isoron.uhabits.activities.habits.list.controllers.*;
 import org.isoron.uhabits.activities.habits.list.model.*;
 import org.isoron.uhabits.commands.*;

uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/ListHabitsMenu.java

@@ -22,6 +22,7 @@ package org.isoron.uhabits.activities.habits.list;
 import android.support.annotation.*;
 import android.view.*;
 
+import org.isoron.androidbase.activities.*;
 import org.isoron.uhabits.*;
 import org.isoron.uhabits.models.*;
 import org.isoron.uhabits.activities.*;

uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/ListHabitsRootView.java

@@ -25,8 +25,8 @@ import android.support.v7.widget.Toolbar;
 import android.view.*;
 import android.widget.*;
 
+import org.isoron.androidbase.activities.*;
 import org.isoron.uhabits.R;
-import org.isoron.uhabits.activities.*;
 import org.isoron.uhabits.activities.common.views.*;
 import org.isoron.uhabits.activities.habits.list.controllers.*;
 import org.isoron.uhabits.activities.habits.list.model.*;

uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/ListHabitsScreen.java

@@ -28,6 +28,7 @@ import android.text.*;
 import android.view.*;
 import android.widget.*;
 
+import org.isoron.androidbase.activities.*;
 import org.isoron.uhabits.*;
 import org.isoron.uhabits.activities.*;
 import org.isoron.uhabits.activities.common.dialogs.*;

uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/ListHabitsSelectionMenu.java

@@ -22,10 +22,10 @@ package org.isoron.uhabits.activities.habits.list;
 import android.support.annotation.*;
 import android.view.*;
 
+import org.isoron.androidbase.activities.*;
 import org.isoron.uhabits.*;
 import org.isoron.uhabits.commands.*;
 import org.isoron.uhabits.models.*;
-import org.isoron.uhabits.activities.*;
 import org.isoron.uhabits.activities.habits.list.controllers.*;
 import org.isoron.uhabits.activities.habits.list.model.*;
 

uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/model/HabitCardListAdapter.java

@@ -23,7 +23,7 @@ import android.support.annotation.*;
 import android.support.v7.widget.*;
 import android.view.*;
 
-import org.isoron.uhabits.activities.*;
+import org.isoron.androidbase.activities.*;
 import org.isoron.uhabits.activities.habits.list.*;
 import org.isoron.uhabits.activities.habits.list.views.*;
 import org.isoron.uhabits.models.*;

uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/ShowHabitActivity.java

@@ -24,8 +24,8 @@ import android.net.*;
 import android.os.*;
 import android.support.annotation.*;
 
+import org.isoron.androidbase.activities.*;
 import org.isoron.uhabits.*;
-import org.isoron.uhabits.activities.*;
 import org.isoron.uhabits.models.*;
 
 /**

uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/ShowHabitComponent.java

@@ -19,8 +19,8 @@
 
 package org.isoron.uhabits.activities.habits.show;
 
+import org.isoron.androidbase.activities.*;
 import org.isoron.uhabits.*;
-import org.isoron.uhabits.activities.*;
 
 import dagger.*;
 

uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/ShowHabitController.java

@@ -21,7 +21,7 @@ package org.isoron.uhabits.activities.habits.show;
 
 import android.support.annotation.*;
 
-import org.isoron.uhabits.activities.*;
+import org.isoron.androidbase.activities.*;
 import org.isoron.uhabits.activities.common.dialogs.*;
 import org.isoron.uhabits.commands.*;
 import org.isoron.uhabits.models.*;

uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/ShowHabitModule.java

@@ -19,7 +19,7 @@
 
 package org.isoron.uhabits.activities.habits.show;
 
-import org.isoron.uhabits.activities.*;
+import org.isoron.androidbase.activities.*;
 import org.isoron.uhabits.models.*;
 
 import dagger.*;

uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/ShowHabitRootView.java

@@ -24,8 +24,8 @@ import android.os.*;
 import android.support.annotation.*;
 import android.support.v7.widget.*;
 
+import org.isoron.androidbase.activities.*;
 import org.isoron.uhabits.R;
-import org.isoron.uhabits.activities.*;
 import org.isoron.uhabits.activities.habits.show.views.*;
 import org.isoron.uhabits.models.*;
 import org.isoron.uhabits.utils.*;

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

@@ -21,7 +21,7 @@ package org.isoron.uhabits.activities.habits.show;
 
 import android.support.annotation.*;
 
-import org.isoron.uhabits.activities.*;
+import org.isoron.androidbase.activities.*;
 import org.isoron.uhabits.activities.common.dialogs.*;
 import org.isoron.uhabits.activities.habits.edit.*;
 import org.isoron.uhabits.models.*;

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

@@ -22,8 +22,8 @@ package org.isoron.uhabits.activities.habits.show;
 import android.support.annotation.*;
 import android.view.*;
 
+import org.isoron.androidbase.activities.*;
 import org.isoron.uhabits.*;
-import org.isoron.uhabits.activities.*;
 import org.isoron.uhabits.models.*;
 import org.isoron.uhabits.tasks.*;
 

uhabits-android/src/main/java/org/isoron/uhabits/activities/settings/SettingsActivity.java

@@ -21,8 +21,8 @@ package org.isoron.uhabits.activities.settings;
 
 import android.os.*;
 
+import org.isoron.androidbase.activities.*;
 import org.isoron.uhabits.*;
-import org.isoron.uhabits.activities.*;
 import org.isoron.uhabits.utils.*;
 
 /**

uhabits-android/src/main/java/org/isoron/uhabits/automation/EditSettingActivity.java

@@ -21,8 +21,8 @@ package org.isoron.uhabits.automation;
 
 import android.os.*;
 
+import org.isoron.androidbase.activities.*;
 import org.isoron.uhabits.*;
-import org.isoron.uhabits.activities.*;
 import org.isoron.uhabits.models.*;
 
 public class EditSettingActivity extends BaseActivity

uhabits-android/src/main/java/org/isoron/uhabits/automation/EditSettingRootView.java

@@ -25,8 +25,8 @@ import android.support.v7.widget.*;
 import android.support.v7.widget.Toolbar;
 import android.widget.*;
 
+import org.isoron.androidbase.activities.*;
 import org.isoron.uhabits.R;
-import org.isoron.uhabits.activities.*;
 import org.isoron.uhabits.models.*;
 import org.isoron.uhabits.utils.*;
 

uhabits-android/src/main/java/org/isoron/uhabits/intents/IntentScheduler.java

@@ -24,6 +24,7 @@ import android.content.*;
 import android.os.*;
 import android.support.annotation.*;
 
+import org.isoron.androidbase.*;
 import org.isoron.uhabits.*;
 
 import javax.inject.*;

uhabits-android/src/main/java/org/isoron/uhabits/intents/PendingIntentFactory.java

@@ -24,6 +24,7 @@ import android.content.*;
 import android.net.*;
 import android.support.annotation.*;
 
+import org.isoron.androidbase.*;
 import org.isoron.uhabits.*;
 import org.isoron.uhabits.models.*;
 import org.isoron.uhabits.receivers.*;

uhabits-android/src/main/java/org/isoron/uhabits/io/LoopDBImporter.java

@@ -27,6 +27,7 @@ import android.util.*;
 
 import com.activeandroid.*;
 
+import org.isoron.androidbase.*;
 import org.isoron.uhabits.*;
 import org.isoron.uhabits.models.*;
 import org.isoron.uhabits.utils.DatabaseUtils;

uhabits-android/src/main/java/org/isoron/uhabits/notifications/NotificationTray.java

@@ -26,6 +26,7 @@ import android.support.annotation.*;
 import android.support.v4.app.*;
 import android.support.v4.app.NotificationCompat.*;
 
+import org.isoron.androidbase.*;
 import org.isoron.uhabits.*;
 import org.isoron.uhabits.commands.*;
 import org.isoron.uhabits.intents.*;

uhabits-android/src/main/java/org/isoron/uhabits/preferences/Preferences.java

@@ -22,6 +22,7 @@ package org.isoron.uhabits.preferences;
 import android.content.*;
 import android.preference.*;
 
+import org.isoron.androidbase.*;
 import org.isoron.uhabits.*;
 import org.isoron.uhabits.activities.*;
 import org.isoron.uhabits.models.*;

uhabits-android/src/main/java/org/isoron/uhabits/preferences/WidgetPreferences.java

@@ -22,6 +22,7 @@ package org.isoron.uhabits.preferences;
 import android.content.*;
 import android.preference.*;
 
+import org.isoron.androidbase.*;
 import org.isoron.uhabits.*;
 import org.isoron.uhabits.models.*;
 

uhabits-android/src/main/java/org/isoron/uhabits/sync/SyncManager.java

@@ -23,6 +23,7 @@ import android.content.*;
 import android.support.annotation.*;
 import android.util.*;
 
+import org.isoron.androidbase.*;
 import org.isoron.uhabits.*;
 import org.isoron.uhabits.commands.*;
 import org.isoron.uhabits.preferences.*;

uhabits-android/src/main/java/org/isoron/uhabits/tasks/ExportCSVTask.java

@@ -24,7 +24,7 @@ import android.support.annotation.*;
 
 import com.google.auto.factory.*;
 
-import org.isoron.uhabits.AppContext;
+import org.isoron.androidbase.AppContext;
 import org.isoron.uhabits.io.*;
 import org.isoron.uhabits.models.*;
 import org.isoron.uhabits.utils.*;

uhabits-android/src/main/java/org/isoron/uhabits/tasks/ExportDBTask.java

@@ -25,8 +25,7 @@ import android.support.annotation.*;
 import com.google.auto.factory.AutoFactory;
 import com.google.auto.factory.Provided;
 
-import org.isoron.uhabits.AppContext;
+import org.isoron.androidbase.AppContext;
-import org.isoron.uhabits.activities.ActivityContext;
 import org.isoron.uhabits.utils.*;
 
 import java.io.*;

uhabits-android/src/main/java/org/isoron/uhabits/utils/FileUtils.java

@@ -25,8 +25,6 @@ import android.support.annotation.*;
 import android.support.v4.content.*;
 import android.util.*;
 
-import org.isoron.uhabits.*;
-
 import java.io.*;
 
 public abstract class FileUtils

uhabits-android/src/main/java/org/isoron/uhabits/utils/MidnightTimer.java

@@ -19,7 +19,7 @@
 
 package org.isoron.uhabits.utils;
 
-import org.isoron.uhabits.activities.*;
+import org.isoron.androidbase.activities.*;
 
 import java.util.*;
 import java.util.concurrent.*;

uhabits-android/src/main/java/org/isoron/uhabits/widgets/WidgetUpdater.java

@@ -23,7 +23,7 @@ import android.appwidget.*;
 import android.content.*;
 import android.support.annotation.*;
 
-import org.isoron.uhabits.*;
+import org.isoron.androidbase.*;
 import org.isoron.uhabits.commands.*;
 import org.isoron.uhabits.tasks.*;
 

uhabits-android/src/test/java/org/isoron/uhabits/activities/BaseActivityTest.java

@@ -27,6 +27,7 @@ import android.support.v7.widget.Toolbar;
 import android.view.*;
 import android.widget.*;
 
+import org.isoron.androidbase.activities.*;
 import org.isoron.uhabits.*;
 import org.isoron.uhabits.activities.common.dialogs.*;
 import org.junit.*;

uhabits-android/src/test/java/org/isoron/uhabits/activities/BaseScreenTest.java

@@ -25,6 +25,7 @@ import android.support.v7.view.ActionMode;
 import android.support.v7.widget.*;
 import android.view.*;
 
+import org.isoron.androidbase.activities.*;
 import org.isoron.uhabits.*;
 import org.junit.*;
 import org.junit.runner.*;

uhabits-android/src/test/java/org/isoron/uhabits/activities/habits/list/ListHabitsControllerTest.java

@@ -19,8 +19,8 @@
 
 package org.isoron.uhabits.activities.habits.list;
 
+import org.isoron.androidbase.activities.*;
 import org.isoron.uhabits.*;
-import org.isoron.uhabits.activities.*;
 import org.isoron.uhabits.activities.habits.list.model.*;
 import org.isoron.uhabits.commands.*;
 import org.isoron.uhabits.models.*;

uhabits-android/src/test/java/org/isoron/uhabits/activities/habits/list/ListHabitsMenuTest.java

@@ -21,6 +21,7 @@ package org.isoron.uhabits.activities.habits.list;
 
 import android.view.*;
 
+import org.isoron.androidbase.activities.*;
 import org.isoron.uhabits.*;
 import org.isoron.uhabits.activities.*;
 import org.isoron.uhabits.activities.habits.list.model.*;

uhabits-android/src/test/java/org/isoron/uhabits/activities/habits/list/ListHabitsScreenTest.java

@@ -22,6 +22,7 @@ package org.isoron.uhabits.activities.habits.list;
 
 import android.content.*;
 
+import org.isoron.androidbase.activities.*;
 import org.isoron.uhabits.*;
 import org.isoron.uhabits.activities.*;
 import org.isoron.uhabits.activities.common.dialogs.*;