Reorganize packages

app/src/androidTest/java/org/isoron/uhabits/BaseViewTest.java

@@ -25,8 +25,8 @@ import android.support.annotation.*;
 import android.view.*;
 import android.widget.*;
 
-import org.isoron.uhabits.ui.widgets.*;
 import org.isoron.uhabits.utils.*;
+import org.isoron.uhabits.widgets.*;
 
 import java.io.*;
 

app/src/androidTest/java/org/isoron/uhabits/HabitLoggerTest.java

@@ -24,7 +24,7 @@ import android.support.test.runner.*;
 import android.test.suitebuilder.annotation.*;
 
 import org.isoron.uhabits.models.*;
-import org.isoron.uhabits.ui.*;
+import org.isoron.uhabits.activities.*;
 import org.junit.*;
 import org.junit.runner.*;
 

app/src/androidTest/java/org/isoron/uhabits/HabitsApplicationTest.java

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

app/src/androidTest/java/org/isoron/uhabits/activities/common/views/FrequencyChartTest.java

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

app/src/androidTest/java/org/isoron/uhabits/activities/common/views/HistoryChartTest.java

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

app/src/androidTest/java/org/isoron/uhabits/activities/common/views/RingViewTest.java

@@ -17,7 +17,7 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.isoron.uhabits.ui.common.views;
+package org.isoron.uhabits.activities.common.views;
 
 import android.graphics.*;
 import android.support.test.runner.*;

app/src/androidTest/java/org/isoron/uhabits/activities/common/views/ScoreChartTest.java

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

app/src/androidTest/java/org/isoron/uhabits/activities/common/views/StreakChartTest.java

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

app/src/androidTest/java/org/isoron/uhabits/activities/habits/list/views/CheckmarkButtonViewTest.java

@@ -17,7 +17,7 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.isoron.uhabits.ui.habits.list.views;
+package org.isoron.uhabits.activities.habits.list.views;
 
 import android.support.test.runner.AndroidJUnit4;
 import android.test.suitebuilder.annotation.*;

app/src/androidTest/java/org/isoron/uhabits/activities/habits/list/views/CheckmarkPanelViewTest.java

@@ -17,7 +17,7 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.isoron.uhabits.ui.habits.list.views;
+package org.isoron.uhabits.activities.habits.list.views;
 
 import android.support.test.runner.AndroidJUnit4;
 import android.test.suitebuilder.annotation.*;

app/src/androidTest/java/org/isoron/uhabits/activities/habits/list/views/HintViewTest.java

@@ -17,13 +17,13 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.isoron.uhabits.ui.habits.list.views;
+package org.isoron.uhabits.activities.habits.list.views;
 
 import android.support.test.runner.*;
 import android.test.suitebuilder.annotation.*;
 
 import org.isoron.uhabits.*;
-import org.isoron.uhabits.ui.habits.list.model.*;
+import org.isoron.uhabits.activities.habits.list.model.*;
 import org.junit.*;
 import org.junit.runner.*;
 

app/src/androidTest/java/org/isoron/uhabits/activities/habits/show/views/FrequencyCardTest.java

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

app/src/androidTest/java/org/isoron/uhabits/activities/habits/show/views/HistoryCardTest.java

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

app/src/androidTest/java/org/isoron/uhabits/activities/habits/show/views/OverviewCardTest.java

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

app/src/androidTest/java/org/isoron/uhabits/activities/habits/show/views/ScoreCardTest.java

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

app/src/androidTest/java/org/isoron/uhabits/activities/habits/show/views/StreakCardTest.java

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

app/src/androidTest/java/org/isoron/uhabits/activities/habits/show/views/SubtitleCardTest.java

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

app/src/androidTest/java/org/isoron/uhabits/activities/widgets/CheckmarkWidgetTest.java

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

app/src/androidTest/java/org/isoron/uhabits/activities/widgets/FrequencyWidgetTest.java

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

app/src/androidTest/java/org/isoron/uhabits/activities/widgets/HistoryWidgetTest.java

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

app/src/androidTest/java/org/isoron/uhabits/activities/widgets/ScoreWidgetTest.java

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

app/src/androidTest/java/org/isoron/uhabits/activities/widgets/StreakWidgetTest.java

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

app/src/androidTest/java/org/isoron/uhabits/widgets/views/CheckmarkWidgetViewTest.java

@@ -17,7 +17,7 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.isoron.uhabits.ui.widgets.views;
+package org.isoron.uhabits.widgets.views;
 
 import android.support.test.runner.*;
 import android.test.suitebuilder.annotation.*;

app/src/main/AndroidManifest.xml

@@ -60,7 +60,7 @@
         </activity>
 
         <activity
-            android:name=".ui.habits.show.ShowHabitActivity"
+            android:name=".activities.habits.show.ShowHabitActivity"
             android:label="@string/title_activity_show_habit">
             <meta-data
                 android:name="android.support.PARENT_ACTIVITY"
@@ -68,7 +68,7 @@
         </activity>
 
         <activity
-            android:name=".ui.settings.SettingsActivity"
+            android:name=".activities.settings.SettingsActivity"
             android:label="@string/settings">
             <meta-data
                 android:name="android.support.PARENT_ACTIVITY"
@@ -76,12 +76,12 @@
         </activity>
 
         <activity
-            android:name=".ui.intro.IntroActivity"
+            android:name=".activities.intro.IntroActivity"
             android:label=""
             android:theme="@style/Theme.AppCompat.Light.NoActionBar"/>
 
         <activity
-            android:name=".ui.widgets.HabitPickerDialog"
+            android:name=".widgets.HabitPickerDialog"
             android:theme="@style/Theme.AppCompat.Light.Dialog">
             <intent-filter>
                 <action android:name="android.appwidget.action.APPWIDGET_CONFIGURE"/>
@@ -89,7 +89,7 @@
         </activity>
 
         <activity
-            android:name=".ui.about.AboutActivity"
+            android:name=".activities.about.AboutActivity"
             android:label="@string/about">
             <meta-data
                 android:name="android.support.PARENT_ACTIVITY"

app/src/main/java/org/isoron/uhabits/AppComponent.java

@@ -26,8 +26,8 @@ import org.isoron.uhabits.models.*;
 import org.isoron.uhabits.models.sqlite.*;
 import org.isoron.uhabits.receivers.*;
 import org.isoron.uhabits.tasks.*;
-import org.isoron.uhabits.ui.widgets.*;
 import org.isoron.uhabits.utils.*;
+import org.isoron.uhabits.widgets.*;
 
 import javax.inject.*;
 

app/src/main/java/org/isoron/uhabits/HabitsApplication.java

@@ -25,8 +25,8 @@ import android.support.annotation.*;
 
 import com.activeandroid.*;
 
-import org.isoron.uhabits.ui.widgets.*;
 import org.isoron.uhabits.utils.*;
+import org.isoron.uhabits.widgets.*;
 
 import java.io.*;
 

app/src/main/java/org/isoron/uhabits/MainActivity.java

@@ -19,7 +19,7 @@
 
 package org.isoron.uhabits;
 
-import org.isoron.uhabits.ui.habits.list.ListHabitsActivity;
+import org.isoron.uhabits.activities.habits.list.ListHabitsActivity;
 
 /**
  * Application that starts upon clicking the launcher icon.

app/src/main/java/org/isoron/uhabits/activities/ActivityComponent.java

@@ -17,9 +17,9 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.isoron.uhabits.ui;
+package org.isoron.uhabits.activities;
 
-import org.isoron.uhabits.ui.common.dialogs.*;
+import org.isoron.uhabits.activities.common.dialogs.*;
 
 import dagger.*;
 

app/src/main/java/org/isoron/uhabits/activities/ActivityContext.java

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

app/src/main/java/org/isoron/uhabits/activities/ActivityModule.java

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

app/src/main/java/org/isoron/uhabits/activities/ActivityScope.java

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

app/src/main/java/org/isoron/uhabits/activities/BaseActivity.java

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

app/src/main/java/org/isoron/uhabits/activities/BaseMenu.java

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

app/src/main/java/org/isoron/uhabits/activities/BaseRootView.java

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

app/src/main/java/org/isoron/uhabits/activities/BaseScreen.java

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

app/src/main/java/org/isoron/uhabits/activities/BaseSelectionMenu.java

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

app/src/main/java/org/isoron/uhabits/activities/BaseSystem.java

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

app/src/main/java/org/isoron/uhabits/activities/about/AboutActivity.java

@@ -17,7 +17,7 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.isoron.uhabits.ui.about;
+package org.isoron.uhabits.activities.about;
 
 import android.content.*;
 import android.net.*;
@@ -26,7 +26,7 @@ import android.view.*;
 import android.widget.*;
 
 import org.isoron.uhabits.*;
-import org.isoron.uhabits.ui.*;
+import org.isoron.uhabits.activities.*;
 import org.isoron.uhabits.utils.*;
 
 /**

app/src/main/java/org/isoron/uhabits/activities/about/package-info.java

@@ -20,4 +20,4 @@
 /**
  * Provides activity that shows information about the app.
  */
-package org.isoron.uhabits.ui.about;
+package org.isoron.uhabits.activities.about;

app/src/main/java/org/isoron/uhabits/activities/common/dialogs/ColorPickerDialog.java

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

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

@@ -17,7 +17,7 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.isoron.uhabits.ui.common.dialogs;
+package org.isoron.uhabits.activities.common.dialogs;
 
 import android.content.*;
 import android.support.v7.app.*;
@@ -25,7 +25,7 @@ import android.support.v7.app.*;
 import com.google.auto.factory.*;
 
 import org.isoron.uhabits.*;
-import org.isoron.uhabits.ui.*;
+import org.isoron.uhabits.activities.*;
 
 import butterknife.*;
 

app/src/main/java/org/isoron/uhabits/activities/common/dialogs/DialogFactory.java

@@ -17,14 +17,14 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.isoron.uhabits.ui.common.dialogs;
+package org.isoron.uhabits.activities.common.dialogs;
 
 import android.content.*;
 import android.support.annotation.*;
 
 import org.isoron.uhabits.models.*;
-import org.isoron.uhabits.ui.*;
-import org.isoron.uhabits.ui.habits.edit.*;
+import org.isoron.uhabits.activities.*;
+import org.isoron.uhabits.activities.habits.edit.*;
 
 import javax.inject.*;
 

app/src/main/java/org/isoron/uhabits/activities/common/dialogs/FilePickerDialog.java

@@ -17,7 +17,7 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.isoron.uhabits.ui.common.dialogs;
+package org.isoron.uhabits.activities.common.dialogs;
 
 import android.content.*;
 import android.support.annotation.*;
@@ -28,7 +28,7 @@ import android.widget.*;
 
 import com.google.auto.factory.*;
 
-import org.isoron.uhabits.ui.*;
+import org.isoron.uhabits.activities.*;
 
 import java.io.*;
 import java.util.*;

app/src/main/java/org/isoron/uhabits/activities/common/dialogs/HistoryEditorDialog.java

@@ -17,7 +17,7 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.isoron.uhabits.ui.common.dialogs;
+package org.isoron.uhabits.activities.common.dialogs;
 
 import android.app.*;
 import android.content.*;
@@ -30,7 +30,7 @@ import android.util.*;
 import org.isoron.uhabits.*;
 import org.isoron.uhabits.models.*;
 import org.isoron.uhabits.tasks.*;
-import org.isoron.uhabits.ui.common.views.*;
+import org.isoron.uhabits.activities.common.views.*;
 import org.isoron.uhabits.utils.*;
 
 public class HistoryEditorDialog extends AppCompatDialogFragment

app/src/main/java/org/isoron/uhabits/activities/common/dialogs/WeekdayPickerDialog.java

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

app/src/main/java/org/isoron/uhabits/activities/common/views/FrequencyChart.java

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

app/src/main/java/org/isoron/uhabits/activities/common/views/HabitChart.java

@@ -17,7 +17,7 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.isoron.uhabits.ui.common.views;
+package org.isoron.uhabits.activities.common.views;
 
 import org.isoron.uhabits.models.Habit;
 

app/src/main/java/org/isoron/uhabits/activities/common/views/HistoryChart.java

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

app/src/main/java/org/isoron/uhabits/activities/common/views/RingView.java

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

app/src/main/java/org/isoron/uhabits/activities/common/views/ScoreChart.java

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

app/src/main/java/org/isoron/uhabits/activities/common/views/ScrollableChart.java

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

app/src/main/java/org/isoron/uhabits/activities/common/views/StreakChart.java

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

app/src/main/java/org/isoron/uhabits/activities/common/views/package-info.java

@@ -20,4 +20,4 @@
 /**
  * Provides views that are used across the app, such as RingView.
  */
-package org.isoron.uhabits.ui.common.views;
+package org.isoron.uhabits.activities.common.views;

app/src/main/java/org/isoron/uhabits/activities/habits/edit/BaseDialog.java

@@ -17,7 +17,7 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.isoron.uhabits.ui.habits.edit;
+package org.isoron.uhabits.activities.habits.edit;
 
 import android.app.*;
 import android.os.*;
@@ -32,8 +32,8 @@ import com.android.datetimepicker.time.TimePickerDialog;
 import org.isoron.uhabits.*;
 import org.isoron.uhabits.commands.*;
 import org.isoron.uhabits.models.*;
-import org.isoron.uhabits.ui.*;
-import org.isoron.uhabits.ui.common.dialogs.*;
+import org.isoron.uhabits.activities.*;
+import org.isoron.uhabits.activities.common.dialogs.*;
 import org.isoron.uhabits.utils.*;
 
 import java.util.*;

app/src/main/java/org/isoron/uhabits/activities/habits/edit/BaseDialogHelper.java

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

app/src/main/java/org/isoron/uhabits/activities/habits/edit/CreateHabitDialog.java

@@ -17,7 +17,7 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.isoron.uhabits.ui.habits.edit;
+package org.isoron.uhabits.activities.habits.edit;
 
 import com.google.auto.factory.*;
 

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

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

app/src/main/java/org/isoron/uhabits/activities/habits/edit/package-info.java

@@ -20,4 +20,4 @@
 /**
  * Provides dialogs for editing habits and related classes.
  */
-package org.isoron.uhabits.ui.habits.edit;
+package org.isoron.uhabits.activities.habits.edit;

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

@@ -17,13 +17,13 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.isoron.uhabits.ui.habits.list;
+package org.isoron.uhabits.activities.habits.list;
 
 import android.os.*;
 
 import org.isoron.uhabits.*;
-import org.isoron.uhabits.ui.*;
-import org.isoron.uhabits.ui.habits.list.model.*;
+import org.isoron.uhabits.activities.*;
+import org.isoron.uhabits.activities.habits.list.model.*;
 
 /**
  * Activity that allows the user to see and modify the list of habits.

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

@@ -17,11 +17,11 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.isoron.uhabits.ui.habits.list;
+package org.isoron.uhabits.activities.habits.list;
 
 import org.isoron.uhabits.*;
-import org.isoron.uhabits.ui.*;
-import org.isoron.uhabits.ui.habits.list.model.*;
+import org.isoron.uhabits.activities.*;
+import org.isoron.uhabits.activities.habits.list.model.*;
 
 import dagger.*;
 

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

@@ -17,7 +17,7 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.isoron.uhabits.ui.habits.list;
+package org.isoron.uhabits.activities.habits.list;
 
 import android.os.*;
 import android.support.annotation.*;
@@ -26,11 +26,11 @@ import org.isoron.uhabits.*;
 import org.isoron.uhabits.commands.*;
 import org.isoron.uhabits.models.*;
 import org.isoron.uhabits.tasks.*;
-import org.isoron.uhabits.ui.*;
-import org.isoron.uhabits.ui.habits.list.controllers.*;
-import org.isoron.uhabits.ui.habits.list.model.*;
-import org.isoron.uhabits.ui.widgets.*;
+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.*;
+import org.isoron.uhabits.widgets.*;
 
 import java.io.*;
 import java.util.*;

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

@@ -17,15 +17,15 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.isoron.uhabits.ui.habits.list;
+package org.isoron.uhabits.activities.habits.list;
 
 import android.support.annotation.*;
 import android.view.*;
 
 import org.isoron.uhabits.*;
 import org.isoron.uhabits.models.*;
-import org.isoron.uhabits.ui.*;
-import org.isoron.uhabits.ui.habits.list.model.*;
+import org.isoron.uhabits.activities.*;
+import org.isoron.uhabits.activities.habits.list.model.*;
 import org.isoron.uhabits.utils.*;
 
 import javax.inject.*;

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

@@ -17,7 +17,7 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.isoron.uhabits.ui.habits.list;
+package org.isoron.uhabits.activities.habits.list;
 
 import android.content.*;
 import android.content.res.*;
@@ -28,10 +28,10 @@ import android.widget.*;
 
 import org.isoron.uhabits.*;
 import org.isoron.uhabits.models.*;
-import org.isoron.uhabits.ui.*;
-import org.isoron.uhabits.ui.habits.list.controllers.*;
-import org.isoron.uhabits.ui.habits.list.model.*;
-import org.isoron.uhabits.ui.habits.list.views.*;
+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.activities.habits.list.views.*;
 import org.isoron.uhabits.utils.*;
 
 import javax.inject.*;

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

@@ -17,7 +17,7 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.isoron.uhabits.ui.habits.list;
+package org.isoron.uhabits.activities.habits.list;
 
 import android.content.*;
 import android.os.*;
@@ -28,10 +28,10 @@ import org.isoron.uhabits.commands.*;
 import org.isoron.uhabits.intents.*;
 import org.isoron.uhabits.io.*;
 import org.isoron.uhabits.models.*;
-import org.isoron.uhabits.ui.*;
-import org.isoron.uhabits.ui.common.dialogs.*;
-import org.isoron.uhabits.ui.common.dialogs.ColorPickerDialog.*;
-import org.isoron.uhabits.ui.habits.edit.*;
+import org.isoron.uhabits.activities.*;
+import org.isoron.uhabits.activities.common.dialogs.*;
+import org.isoron.uhabits.activities.common.dialogs.ColorPickerDialog.*;
+import org.isoron.uhabits.activities.habits.edit.*;
 import org.isoron.uhabits.utils.*;
 
 import java.io.*;

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

@@ -17,7 +17,7 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.isoron.uhabits.ui.habits.list;
+package org.isoron.uhabits.activities.habits.list;
 
 import android.support.annotation.*;
 import android.view.*;
@@ -25,9 +25,9 @@ import android.view.*;
 import org.isoron.uhabits.*;
 import org.isoron.uhabits.commands.*;
 import org.isoron.uhabits.models.*;
-import org.isoron.uhabits.ui.*;
-import org.isoron.uhabits.ui.habits.list.controllers.*;
-import org.isoron.uhabits.ui.habits.list.model.*;
+import org.isoron.uhabits.activities.*;
+import org.isoron.uhabits.activities.habits.list.controllers.*;
+import org.isoron.uhabits.activities.habits.list.model.*;
 
 import java.util.*;
 

app/src/main/java/org/isoron/uhabits/activities/habits/list/controllers/CheckmarkButtonController.java

@@ -17,13 +17,13 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.isoron.uhabits.ui.habits.list.controllers;
+package org.isoron.uhabits.activities.habits.list.controllers;
 
 import android.support.annotation.*;
 
 import org.isoron.uhabits.*;
 import org.isoron.uhabits.models.*;
-import org.isoron.uhabits.ui.habits.list.views.*;
+import org.isoron.uhabits.activities.habits.list.views.*;
 import org.isoron.uhabits.utils.*;
 
 public class CheckmarkButtonController

app/src/main/java/org/isoron/uhabits/activities/habits/list/controllers/HabitCardController.java

@@ -17,12 +17,12 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.isoron.uhabits.ui.habits.list.controllers;
+package org.isoron.uhabits.activities.habits.list.controllers;
 
 import android.support.annotation.*;
 
 import org.isoron.uhabits.models.Habit;
-import org.isoron.uhabits.ui.habits.list.views.HabitCardView;
+import org.isoron.uhabits.activities.habits.list.views.HabitCardView;
 
 public class HabitCardController implements HabitCardView.Controller
 {

app/src/main/java/org/isoron/uhabits/activities/habits/list/controllers/HabitCardListController.java

@@ -17,13 +17,13 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.isoron.uhabits.ui.habits.list.controllers;
+package org.isoron.uhabits.activities.habits.list.controllers;
 
 import android.support.annotation.*;
 
 import org.isoron.uhabits.models.*;
-import org.isoron.uhabits.ui.habits.list.model.*;
-import org.isoron.uhabits.ui.habits.list.views.*;
+import org.isoron.uhabits.activities.habits.list.model.*;
+import org.isoron.uhabits.activities.habits.list.views.*;
 
 /**
  * Controller responsible for receiving and processing the events generated by a

app/src/main/java/org/isoron/uhabits/activities/habits/list/controllers/package-info.java

@@ -18,6 +18,6 @@
  */
 
 /**
- * Provides controllers that are specific for {@link org.isoron.uhabits.ui.habits.list.ListHabitsActivity}.
+ * Provides controllers that are specific for {@link org.isoron.uhabits.activities.habits.list.ListHabitsActivity}.
  */
-package org.isoron.uhabits.ui.habits.list.controllers;
+package org.isoron.uhabits.activities.habits.list.controllers;

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

@@ -17,15 +17,15 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.isoron.uhabits.ui.habits.list.model;
+package org.isoron.uhabits.activities.habits.list.model;
 
 import android.support.annotation.*;
 import android.support.v7.widget.*;
 import android.view.*;
 
 import org.isoron.uhabits.models.*;
-import org.isoron.uhabits.ui.*;
-import org.isoron.uhabits.ui.habits.list.views.*;
+import org.isoron.uhabits.activities.*;
+import org.isoron.uhabits.activities.habits.list.views.*;
 
 import java.util.*;
 

app/src/main/java/org/isoron/uhabits/activities/habits/list/model/HabitCardListCache.java

@@ -17,7 +17,7 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.isoron.uhabits.ui.habits.list.model;
+package org.isoron.uhabits.activities.habits.list.model;
 
 import android.support.annotation.*;
 
@@ -25,7 +25,7 @@ import org.isoron.uhabits.*;
 import org.isoron.uhabits.commands.*;
 import org.isoron.uhabits.models.*;
 import org.isoron.uhabits.tasks.*;
-import org.isoron.uhabits.ui.*;
+import org.isoron.uhabits.activities.*;
 import org.isoron.uhabits.utils.*;
 
 import java.util.*;

app/src/main/java/org/isoron/uhabits/activities/habits/list/model/HabitCardViewHolder.java

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

app/src/main/java/org/isoron/uhabits/activities/habits/list/model/HintList.java

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

app/src/main/java/org/isoron/uhabits/activities/habits/list/model/package-info.java

@@ -18,6 +18,6 @@
  */
 
 /**
- * Provides models that are specific for {@link org.isoron.uhabits.ui.habits.list.ListHabitsActivity}.
+ * Provides models that are specific for {@link org.isoron.uhabits.activities.habits.list.ListHabitsActivity}.
  */
-package org.isoron.uhabits.ui.habits.list.model;
+package org.isoron.uhabits.activities.habits.list.model;

app/src/main/java/org/isoron/uhabits/activities/habits/list/package-info.java

@@ -20,4 +20,4 @@
 /**
  * Provides acitivity for listing habits and related classes.
  */
-package org.isoron.uhabits.ui.habits.list;
+package org.isoron.uhabits.activities.habits.list;

app/src/main/java/org/isoron/uhabits/activities/habits/list/views/CheckmarkButtonView.java

@@ -17,7 +17,7 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.isoron.uhabits.ui.habits.list.views;
+package org.isoron.uhabits.activities.habits.list.views;
 
 import android.content.*;
 import android.graphics.*;
@@ -26,7 +26,7 @@ import android.widget.*;
 
 import org.isoron.uhabits.*;
 import org.isoron.uhabits.models.*;
-import org.isoron.uhabits.ui.habits.list.controllers.*;
+import org.isoron.uhabits.activities.habits.list.controllers.*;
 import org.isoron.uhabits.utils.*;
 
 import butterknife.*;

app/src/main/java/org/isoron/uhabits/activities/habits/list/views/CheckmarkPanelView.java

@@ -17,7 +17,7 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.isoron.uhabits.ui.habits.list.views;
+package org.isoron.uhabits.activities.habits.list.views;
 
 import android.content.*;
 import android.support.annotation.*;
@@ -26,7 +26,7 @@ import android.widget.*;
 
 import org.isoron.uhabits.*;
 import org.isoron.uhabits.models.*;
-import org.isoron.uhabits.ui.habits.list.controllers.*;
+import org.isoron.uhabits.activities.habits.list.controllers.*;
 import org.isoron.uhabits.utils.*;
 
 public class CheckmarkPanelView extends LinearLayout

app/src/main/java/org/isoron/uhabits/activities/habits/list/views/HabitCardListView.java

@@ -17,7 +17,7 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.isoron.uhabits.ui.habits.list.views;
+package org.isoron.uhabits.activities.habits.list.views;
 
 import android.content.*;
 import android.support.annotation.*;
@@ -27,8 +27,8 @@ import android.util.*;
 import android.view.*;
 
 import org.isoron.uhabits.models.*;
-import org.isoron.uhabits.ui.habits.list.controllers.*;
-import org.isoron.uhabits.ui.habits.list.model.*;
+import org.isoron.uhabits.activities.habits.list.controllers.*;
+import org.isoron.uhabits.activities.habits.list.model.*;
 
 import java.util.*;
 

app/src/main/java/org/isoron/uhabits/activities/habits/list/views/HabitCardView.java

@@ -17,7 +17,7 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.isoron.uhabits.ui.habits.list.views;
+package org.isoron.uhabits.activities.habits.list.views;
 
 import android.annotation.*;
 import android.content.*;
@@ -29,7 +29,7 @@ import android.widget.*;
 
 import org.isoron.uhabits.*;
 import org.isoron.uhabits.models.*;
-import org.isoron.uhabits.ui.common.views.*;
+import org.isoron.uhabits.activities.common.views.*;
 import org.isoron.uhabits.utils.*;
 
 import java.util.*;

app/src/main/java/org/isoron/uhabits/activities/habits/list/views/HeaderView.java

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

app/src/main/java/org/isoron/uhabits/activities/habits/list/views/HintView.java

@@ -17,7 +17,7 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.isoron.uhabits.ui.habits.list.views;
+package org.isoron.uhabits.activities.habits.list.views;
 
 import android.animation.AnimatorListenerAdapter;
 import android.annotation.SuppressLint;
@@ -29,7 +29,7 @@ import android.widget.FrameLayout;
 import android.widget.TextView;
 
 import org.isoron.uhabits.R;
-import org.isoron.uhabits.ui.habits.list.model.HintList;
+import org.isoron.uhabits.activities.habits.list.model.HintList;
 
 import java.util.Random;
 

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

@@ -17,7 +17,7 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.isoron.uhabits.ui.habits.show;
+package org.isoron.uhabits.activities.habits.show;
 
 import android.content.*;
 import android.net.*;
@@ -26,7 +26,7 @@ import android.support.annotation.*;
 
 import org.isoron.uhabits.*;
 import org.isoron.uhabits.models.*;
-import org.isoron.uhabits.ui.*;
+import org.isoron.uhabits.activities.*;
 
 /**
  * Activity that allows the user to see more information about a single habit.

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

@@ -17,14 +17,14 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.isoron.uhabits.ui.habits.show;
+package org.isoron.uhabits.activities.habits.show;
 
 import android.support.annotation.*;
 
 import org.isoron.uhabits.*;
 import org.isoron.uhabits.commands.*;
 import org.isoron.uhabits.models.*;
-import org.isoron.uhabits.ui.common.dialogs.*;
+import org.isoron.uhabits.activities.common.dialogs.*;
 
 public class ShowHabitController
     implements ShowHabitRootView.Controller, HistoryEditorDialog.Controller

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

@@ -17,7 +17,7 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.isoron.uhabits.ui.habits.show;
+package org.isoron.uhabits.activities.habits.show;
 
 import android.content.*;
 import android.support.annotation.*;
@@ -25,8 +25,8 @@ import android.support.v7.widget.*;
 
 import org.isoron.uhabits.*;
 import org.isoron.uhabits.models.*;
-import org.isoron.uhabits.ui.*;
-import org.isoron.uhabits.ui.habits.show.views.*;
+import org.isoron.uhabits.activities.*;
+import org.isoron.uhabits.activities.habits.show.views.*;
 import org.isoron.uhabits.utils.*;
 
 import butterknife.*;

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

@@ -17,14 +17,14 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.isoron.uhabits.ui.habits.show;
+package org.isoron.uhabits.activities.habits.show;
 
 import android.support.annotation.*;
 
 import org.isoron.uhabits.models.*;
-import org.isoron.uhabits.ui.*;
-import org.isoron.uhabits.ui.common.dialogs.*;
-import org.isoron.uhabits.ui.habits.edit.*;
+import org.isoron.uhabits.activities.*;
+import org.isoron.uhabits.activities.common.dialogs.*;
+import org.isoron.uhabits.activities.habits.edit.*;
 
 public class ShowHabitScreen extends BaseScreen
 {

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

@@ -17,13 +17,13 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.isoron.uhabits.ui.habits.show;
+package org.isoron.uhabits.activities.habits.show;
 
 import android.support.annotation.*;
 import android.view.*;
 
 import org.isoron.uhabits.*;
-import org.isoron.uhabits.ui.*;
+import org.isoron.uhabits.activities.*;
 
 public class ShowHabitsMenu extends BaseMenu
 {

app/src/main/java/org/isoron/uhabits/activities/habits/show/package-info.java

@@ -21,4 +21,4 @@
  * Provides activity that displays detailed habit information and related
  * classes.
  */
-package org.isoron.uhabits.ui.habits.show;
+package org.isoron.uhabits.activities.habits.show;

app/src/main/java/org/isoron/uhabits/activities/habits/show/views/FrequencyCard.java

@@ -17,7 +17,7 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.isoron.uhabits.ui.habits.show.views;
+package org.isoron.uhabits.activities.habits.show.views;
 
 import android.content.*;
 import android.util.*;
@@ -26,7 +26,7 @@ import android.widget.*;
 import org.isoron.uhabits.*;
 import org.isoron.uhabits.models.*;
 import org.isoron.uhabits.tasks.*;
-import org.isoron.uhabits.ui.common.views.*;
+import org.isoron.uhabits.activities.common.views.*;
 import org.isoron.uhabits.utils.*;
 
 import java.util.*;

app/src/main/java/org/isoron/uhabits/activities/habits/show/views/HabitCard.java

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

app/src/main/java/org/isoron/uhabits/activities/habits/show/views/HistoryCard.java

@@ -17,7 +17,7 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.isoron.uhabits.ui.habits.show.views;
+package org.isoron.uhabits.activities.habits.show.views;
 
 import android.content.*;
 import android.support.annotation.*;
@@ -27,7 +27,7 @@ import android.widget.*;
 import org.isoron.uhabits.*;
 import org.isoron.uhabits.models.*;
 import org.isoron.uhabits.tasks.*;
-import org.isoron.uhabits.ui.common.views.*;
+import org.isoron.uhabits.activities.common.views.*;
 import org.isoron.uhabits.utils.*;
 
 import butterknife.*;

app/src/main/java/org/isoron/uhabits/activities/habits/show/views/OverviewCard.java

@@ -17,7 +17,7 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.isoron.uhabits.ui.habits.show.views;
+package org.isoron.uhabits.activities.habits.show.views;
 
 import android.content.*;
 import android.support.annotation.*;
@@ -27,7 +27,7 @@ import android.widget.*;
 import org.isoron.uhabits.*;
 import org.isoron.uhabits.models.*;
 import org.isoron.uhabits.tasks.*;
-import org.isoron.uhabits.ui.common.views.*;
+import org.isoron.uhabits.activities.common.views.*;
 import org.isoron.uhabits.utils.*;
 
 import butterknife.*;

app/src/main/java/org/isoron/uhabits/activities/habits/show/views/ScoreCard.java

@@ -17,7 +17,7 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.isoron.uhabits.ui.habits.show.views;
+package org.isoron.uhabits.activities.habits.show.views;
 
 import android.content.*;
 import android.support.annotation.*;
@@ -27,7 +27,7 @@ import android.widget.*;
 import org.isoron.uhabits.*;
 import org.isoron.uhabits.models.*;
 import org.isoron.uhabits.tasks.*;
-import org.isoron.uhabits.ui.common.views.*;
+import org.isoron.uhabits.activities.common.views.*;
 import org.isoron.uhabits.utils.*;
 
 import java.util.*;

app/src/main/java/org/isoron/uhabits/activities/habits/show/views/StreakCard.java

@@ -17,7 +17,7 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.isoron.uhabits.ui.habits.show.views;
+package org.isoron.uhabits.activities.habits.show.views;
 
 import android.content.*;
 import android.util.*;
@@ -26,7 +26,7 @@ import android.widget.*;
 import org.isoron.uhabits.*;
 import org.isoron.uhabits.models.*;
 import org.isoron.uhabits.tasks.*;
-import org.isoron.uhabits.ui.common.views.*;
+import org.isoron.uhabits.activities.common.views.*;
 import org.isoron.uhabits.utils.*;
 
 import java.util.*;

app/src/main/java/org/isoron/uhabits/activities/habits/show/views/SubtitleCard.java

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

app/src/main/java/org/isoron/uhabits/activities/habits/show/views/package-info.java

@@ -19,6 +19,6 @@
 
 /**
  * Provides custom views that are used primarily on {@link
- * org.isoron.uhabits.ui.habits.show.ShowHabitActivity}.
+ * org.isoron.uhabits.activities.habits.show.ShowHabitActivity}.
  */
-package org.isoron.uhabits.ui.habits.show.views;
+package org.isoron.uhabits.activities.habits.show.views;

app/src/main/java/org/isoron/uhabits/activities/intro/IntroActivity.java

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

app/src/main/java/org/isoron/uhabits/activities/intro/package-info.java

@@ -20,4 +20,4 @@
 /**
  * Provides activity that introduces app to the user and related classes.
  */
-package org.isoron.uhabits.ui.intro;
+package org.isoron.uhabits.activities.intro;

app/src/main/java/org/isoron/uhabits/activities/package-info.java

@@ -18,6 +18,6 @@
  */
 
 /**
- * Provides classes for the Android user interface.
+ * Provides classes for the Android activites.
  */
-package org.isoron.uhabits.ui;
+package org.isoron.uhabits.activities;

app/src/main/java/org/isoron/uhabits/activities/settings/SettingsActivity.java

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

app/src/main/java/org/isoron/uhabits/activities/settings/SettingsFragment.java

@@ -17,7 +17,7 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.isoron.uhabits.ui.settings;
+package org.isoron.uhabits.activities.settings;
 
 import android.app.backup.*;
 import android.content.*;
@@ -25,7 +25,7 @@ import android.os.*;
 import android.support.v7.preference.*;
 
 import org.isoron.uhabits.R;
-import org.isoron.uhabits.ui.habits.list.*;
+import org.isoron.uhabits.activities.habits.list.*;
 import org.isoron.uhabits.utils.*;
 
 public class SettingsFragment extends PreferenceFragmentCompat