isoron
/
loop
mirror of https://github.com/iSoron/uhabits.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Reorganize files

Browse Source
pull/145/head
Alinson S. Xavier 9 years ago
parent 6445bf62bc
commit e0198e9926
22 changed files with 39 additions and 33 deletions
Show Stats Download Patch File Download Diff File

6
app/src/main/AndroidManifest.xml
Unescape View File

@ -60,7 +60,7 @@
</activity>
<activity
android:name=".ui.show.ShowHabitActivity"
android:name=".ui.habits.show.ShowHabitActivity"
android:label="@string/title_activity_show_habit">
<meta-data
android:name="android.support.PARENT_ACTIVITY"
@ -76,7 +76,7 @@
</activity>
<activity
android:name=".ui.IntroActivity"
android:name=".ui.intro.IntroActivity"
android:label=""
android:theme="@style/Theme.AppCompat.Light.NoActionBar"/>
@ -89,7 +89,7 @@
</activity>
<activity
android:name=".ui.AboutActivity"
android:name=".ui.about.AboutActivity"
android:label="@string/about">
<meta-data
android:name="android.support.PARENT_ACTIVITY"

2
app/src/main/java/org/isoron/uhabits/HabitBroadcastReceiver.java
Unescape View File

@ -41,7 +41,7 @@ import org.isoron.uhabits.utils.ReminderUtils;
import org.isoron.uhabits.models.Checkmark;
import org.isoron.uhabits.models.Habit;
import org.isoron.uhabits.tasks.BaseTask;
import org.isoron.uhabits.ui.show.ShowHabitActivity;
import org.isoron.uhabits.ui.habits.show.ShowHabitActivity;
import org.isoron.uhabits.widgets.WidgetManager;
import java.util.Date;

8
app/src/main/java/org/isoron/uhabits/MainActivity.java
Unescape View File

@ -35,14 +35,14 @@ import org.isoron.uhabits.models.Checkmark;
import org.isoron.uhabits.models.Habit;
import org.isoron.uhabits.tasks.BaseTask;
import org.isoron.uhabits.tasks.ProgressBar;
import org.isoron.uhabits.ui.AboutActivity;
import org.isoron.uhabits.ui.about.AboutActivity;
import org.isoron.uhabits.ui.AndroidProgressBar;
import org.isoron.uhabits.ui.BaseActivity;
import org.isoron.uhabits.ui.IntroActivity;
import org.isoron.uhabits.ui.list.ListHabitsFragment;
import org.isoron.uhabits.ui.intro.IntroActivity;
import org.isoron.uhabits.ui.habits.list.ListHabitsFragment;
import org.isoron.uhabits.ui.settings.FilePickerDialog;
import org.isoron.uhabits.ui.settings.SettingsActivity;
import org.isoron.uhabits.ui.show.ShowHabitActivity;
import org.isoron.uhabits.ui.habits.show.ShowHabitActivity;
import org.isoron.uhabits.utils.FileUtils;
import org.isoron.uhabits.utils.InterfaceUtils;
import org.isoron.uhabits.widgets.WidgetManager;

1
app/src/main/java/org/isoron/uhabits/MainController.java
Unescape View File

@ -25,6 +25,7 @@ import org.isoron.uhabits.tasks.ExportDBTask;
import org.isoron.uhabits.tasks.ImportDataTask;
import org.isoron.uhabits.tasks.ProgressBar;
import org.isoron.uhabits.utils.DateUtils;
import org.isoron.uhabits.utils.Preferences;
import java.io.File;
import java.io.IOException;

3
app/src/main/java/org/isoron/uhabits/ui/AboutActivity.java → app/src/main/java/org/isoron/uhabits/ui/about/AboutActivity.java
Unescape View File

@ -17,7 +17,7 @@
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package org.isoron.uhabits.ui;
package org.isoron.uhabits.ui.about;
import android.content.Intent;
import android.net.Uri;
@ -27,6 +27,7 @@ import android.widget.TextView;
import org.isoron.uhabits.BuildConfig;
import org.isoron.uhabits.R;
import org.isoron.uhabits.ui.BaseActivity;
import org.isoron.uhabits.utils.InterfaceUtils;
public class AboutActivity extends BaseActivity implements View.OnClickListener

2
app/src/main/java/org/isoron/uhabits/ui/edit/EditHabitDialogFragment.java → app/src/main/java/org/isoron/uhabits/ui/habits/edit/EditHabitDialogFragment.java
Unescape View File

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

2
app/src/main/java/org/isoron/uhabits/ui/edit/HistoryEditorDialog.java → app/src/main/java/org/isoron/uhabits/ui/habits/edit/HistoryEditorDialog.java
Unescape View File

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

2
app/src/main/java/org/isoron/uhabits/ui/edit/WeekdayPickerDialog.java → app/src/main/java/org/isoron/uhabits/ui/habits/edit/WeekdayPickerDialog.java
Unescape View File

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

4
app/src/main/java/org/isoron/uhabits/ui/list/HabitSelectionCallback.java → app/src/main/java/org/isoron/uhabits/ui/habits/list/HabitSelectionCallback.java
Unescape View File

@ -17,7 +17,7 @@
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package org.isoron.uhabits.ui.list;
package org.isoron.uhabits.ui.habits.list;
import android.content.DialogInterface;
import android.support.v7.app.AlertDialog;
@ -35,7 +35,7 @@ import org.isoron.uhabits.commands.DeleteHabitsCommand;
import org.isoron.uhabits.commands.UnarchiveHabitsCommand;
import org.isoron.uhabits.models.Habit;
import org.isoron.uhabits.ui.BaseActivity;
import org.isoron.uhabits.ui.edit.EditHabitDialogFragment;
import org.isoron.uhabits.ui.habits.edit.EditHabitDialogFragment;
import org.isoron.uhabits.utils.ColorUtils;
import org.isoron.uhabits.utils.InterfaceUtils;

2
app/src/main/java/org/isoron/uhabits/ui/list/ListHabitsAdapter.java → app/src/main/java/org/isoron/uhabits/ui/habits/list/ListHabitsAdapter.java
Unescape View File

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

2
app/src/main/java/org/isoron/uhabits/ui/list/ListHabitsController.java → app/src/main/java/org/isoron/uhabits/ui/habits/list/ListHabitsController.java
Unescape View File

@ -17,7 +17,7 @@
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package org.isoron.uhabits.ui.list;
package org.isoron.uhabits.ui.habits.list;
public class ListHabitsController
{

8
app/src/main/java/org/isoron/uhabits/ui/list/ListHabitsFragment.java → app/src/main/java/org/isoron/uhabits/ui/habits/list/ListHabitsFragment.java
Unescape View File

@ -17,7 +17,7 @@
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package org.isoron.uhabits.ui.list;
package org.isoron.uhabits.ui.habits.list;
import android.app.Activity;
import android.os.Bundle;
@ -41,14 +41,14 @@ import android.widget.TextView;
import com.mobeta.android.dslv.DragSortController;
import com.mobeta.android.dslv.DragSortListView;
import org.isoron.uhabits.Preferences;
import org.isoron.uhabits.utils.Preferences;
import org.isoron.uhabits.R;
import org.isoron.uhabits.commands.Command;
import org.isoron.uhabits.commands.ToggleRepetitionCommand;
import org.isoron.uhabits.models.Habit;
import org.isoron.uhabits.ui.BaseActivity;
import org.isoron.uhabits.ui.HintManager;
import org.isoron.uhabits.ui.edit.EditHabitDialogFragment;
import org.isoron.uhabits.ui.habits.edit.EditHabitDialogFragment;
import org.isoron.uhabits.utils.DateUtils;
import org.isoron.uhabits.utils.InterfaceUtils;
import org.isoron.uhabits.utils.InterfaceUtils.OnSavedListener;
@ -130,6 +130,7 @@ public class ListHabitsFragment extends Fragment
private void createListView(View view)
{
listView = (DragSortListView) view.findViewById(R.id.listView);
adapter = new ListHabitsAdapter(getActivity(), loader);
adapter.setSelectedPositions(selectedPositions);
adapter.setOnCheckmarkClickListener(this);
@ -138,7 +139,6 @@ public class ListHabitsFragment extends Fragment
DragSortListView.DragListener dragListener = new HabitsDragListener();
DragSortController dragSortController = new HabitsDragSortController();
listView = (DragSortListView) view.findViewById(R.id.listView);
listView.setAdapter(adapter);
listView.setOnItemClickListener(this);
listView.setOnItemLongClickListener(this);

2
app/src/main/java/org/isoron/uhabits/ui/list/ListHabitsHelper.java → app/src/main/java/org/isoron/uhabits/ui/habits/list/ListHabitsHelper.java
Unescape View File

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

2
app/src/main/java/org/isoron/uhabits/ui/list/ListHabitsLoader.java → app/src/main/java/org/isoron/uhabits/ui/habits/list/ListHabitsLoader.java
Unescape View File

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

2
app/src/main/java/org/isoron/uhabits/ui/show/ShowHabitActivity.java → app/src/main/java/org/isoron/uhabits/ui/habits/show/ShowHabitActivity.java
Unescape View File

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

6
app/src/main/java/org/isoron/uhabits/ui/show/ShowHabitFragment.java → app/src/main/java/org/isoron/uhabits/ui/habits/show/ShowHabitFragment.java
Unescape View File

@ -17,7 +17,7 @@
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package org.isoron.uhabits.ui.show;
package org.isoron.uhabits.ui.habits.show;
import android.os.Bundle;
import android.support.annotation.Nullable;
@ -36,8 +36,8 @@ import android.widget.TextView;
import org.isoron.uhabits.HabitBroadcastReceiver;
import org.isoron.uhabits.R;
import org.isoron.uhabits.commands.Command;
import org.isoron.uhabits.ui.edit.EditHabitDialogFragment;
import org.isoron.uhabits.ui.edit.HistoryEditorDialog;
import org.isoron.uhabits.ui.habits.edit.EditHabitDialogFragment;
import org.isoron.uhabits.ui.habits.edit.HistoryEditorDialog;
import org.isoron.uhabits.utils.ColorUtils;
import org.isoron.uhabits.utils.DateUtils;
import org.isoron.uhabits.utils.ReminderUtils;

2
app/src/main/java/org/isoron/uhabits/ui/IntroActivity.java → app/src/main/java/org/isoron/uhabits/ui/intro/IntroActivity.java
Unescape View File

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

6
app/src/main/java/org/isoron/uhabits/Preferences.java → app/src/main/java/org/isoron/uhabits/utils/Preferences.java
Unescape View File

@ -17,12 +17,16 @@
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package org.isoron.uhabits;
package org.isoron.uhabits.utils;
import android.content.Context;
import android.content.SharedPreferences;
import android.preference.PreferenceManager;
import org.isoron.uhabits.BuildConfig;
import org.isoron.uhabits.HabitsApplication;
import org.isoron.uhabits.R;
public class Preferences
{
private static Preferences singleton;

2
app/src/main/res/layout/edit_habit.xml
Unescape View File

@ -22,7 +22,7 @@
style="@style/dialogForm"
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
tools:context=".ui.edit.EditHabitDialogFragment"
tools:context=".ui.habits.edit.EditHabitDialogFragment"
tools:ignore="MergeRootFrame">
<LinearLayout

2
app/src/main/res/layout/list_habits_activity.xml
Unescape View File

@ -33,7 +33,7 @@
<fragment
android:id="@+id/fragment1"
android:name="org.isoron.uhabits.ui.list.ListHabitsFragment"
android:name="org.isoron.uhabits.ui.habits.list.ListHabitsFragment"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_below="@id/toolbar"

2
app/src/main/res/layout/show_habit.xml
Unescape View File

@ -31,7 +31,7 @@
<LinearLayout
style="@style/CardList"
android:clipToPadding="false"
tools:context=".ui.show.ShowHabitActivity">
tools:context=".ui.habits.show.ShowHabitActivity">
<LinearLayout
android:id="@+id/subtitle"

4
app/src/main/res/layout/show_habit_activity.xml
Unescape View File

@ -24,7 +24,7 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:context=".ui.show.ShowHabitActivity"
tools:context=".ui.habits.show.ShowHabitActivity"
tools:ignore="MergeRootFrame"
tools:menu="show_habit_activity_menu,show_habit_fragment_menu">
@ -35,7 +35,7 @@
<fragment
android:id="@+id/fragment2"
android:name="org.isoron.uhabits.ui.show.ShowHabitFragment"
android:name="org.isoron.uhabits.ui.habits.show.ShowHabitFragment"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_below="@id/toolbar"

Write Preview
Loading…
Cancel
Save