Moved all classes to appropriate packages
This commit is contained in:
parent
3e71f01c20
commit
fd556db351
@ -59,7 +59,7 @@
|
||||
</service>
|
||||
|
||||
<activity
|
||||
android:name=".timers.ui.EditTimerActivity"
|
||||
android:name=".timers.EditTimerActivity"
|
||||
android:label="@string/title_activity_create_timer"
|
||||
android:parentActivityName=".MainActivity"
|
||||
android:windowSoftInputMode="adjustNothing">
|
||||
|
||||
@ -4,7 +4,7 @@ import android.os.Parcel;
|
||||
import android.os.Parcelable;
|
||||
|
||||
import com.google.auto.value.AutoValue;
|
||||
import com.philliphsu.clock2.model.ObjectWithId;
|
||||
import com.philliphsu.clock2.data.ObjectWithId;
|
||||
|
||||
import org.json.JSONObject;
|
||||
|
||||
|
||||
@ -3,7 +3,7 @@ package com.philliphsu.clock2.alarms.data;
|
||||
import android.database.Cursor;
|
||||
|
||||
import com.philliphsu.clock2.alarms.Alarm;
|
||||
import com.philliphsu.clock2.model.BaseItemCursor;
|
||||
import com.philliphsu.clock2.data.BaseItemCursor;
|
||||
|
||||
import static com.philliphsu.clock2.alarms.misc.DaysOfWeek.FRIDAY;
|
||||
import static com.philliphsu.clock2.alarms.misc.DaysOfWeek.MONDAY;
|
||||
|
||||
@ -3,7 +3,7 @@ package com.philliphsu.clock2.alarms.data;
|
||||
import android.content.Context;
|
||||
|
||||
import com.philliphsu.clock2.alarms.Alarm;
|
||||
import com.philliphsu.clock2.model.SQLiteCursorLoader;
|
||||
import com.philliphsu.clock2.data.SQLiteCursorLoader;
|
||||
|
||||
/**
|
||||
* Created by Phillip Hsu on 6/28/2016.
|
||||
|
||||
@ -5,7 +5,7 @@ import android.content.Context;
|
||||
import android.database.Cursor;
|
||||
|
||||
import com.philliphsu.clock2.alarms.Alarm;
|
||||
import com.philliphsu.clock2.model.DatabaseTableManager;
|
||||
import com.philliphsu.clock2.data.DatabaseTableManager;
|
||||
|
||||
import static com.philliphsu.clock2.alarms.misc.DaysOfWeek.FRIDAY;
|
||||
import static com.philliphsu.clock2.alarms.misc.DaysOfWeek.MONDAY;
|
||||
|
||||
@ -4,7 +4,7 @@ import android.content.Context;
|
||||
import android.support.design.widget.Snackbar;
|
||||
import android.view.View;
|
||||
|
||||
import com.philliphsu.clock2.AsyncDatabaseTableUpdateHandler;
|
||||
import com.philliphsu.clock2.data.AsyncDatabaseTableUpdateHandler;
|
||||
import com.philliphsu.clock2.R;
|
||||
import com.philliphsu.clock2.alarms.Alarm;
|
||||
import com.philliphsu.clock2.list.ScrollHandler;
|
||||
|
||||
@ -16,7 +16,7 @@ import android.view.ViewGroup;
|
||||
|
||||
import com.philliphsu.clock2.R;
|
||||
import com.philliphsu.clock2.list.RecyclerViewFragment;
|
||||
import com.philliphsu.clock2.TimePickerDialogController;
|
||||
import com.philliphsu.clock2.dialogs.TimePickerDialogController;
|
||||
import com.philliphsu.clock2.alarms.Alarm;
|
||||
import com.philliphsu.clock2.alarms.data.AlarmsListCursorLoader;
|
||||
import com.philliphsu.clock2.alarms.data.AsyncAlarmsTableUpdateHandler;
|
||||
|
||||
@ -24,7 +24,7 @@ import com.philliphsu.clock2.dialogs.AddLabelDialogController;
|
||||
import com.philliphsu.clock2.list.BaseViewHolder;
|
||||
import com.philliphsu.clock2.list.OnListItemInteractionListener;
|
||||
import com.philliphsu.clock2.R;
|
||||
import com.philliphsu.clock2.TimePickerDialogController;
|
||||
import com.philliphsu.clock2.dialogs.TimePickerDialogController;
|
||||
import com.philliphsu.clock2.timepickers.Utils;
|
||||
import com.philliphsu.clock2.timepickers.BaseTimePickerDialog.OnTimeSetListener;
|
||||
import com.philliphsu.clock2.util.TimeTextUtils;
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
package com.philliphsu.clock2;
|
||||
package com.philliphsu.clock2.chronometer;
|
||||
|
||||
import android.annotation.TargetApi;
|
||||
import android.content.Context;
|
||||
@ -1,4 +1,4 @@
|
||||
package com.philliphsu.clock2;
|
||||
package com.philliphsu.clock2.chronometer;
|
||||
|
||||
import android.content.res.Resources;
|
||||
import android.os.SystemClock;
|
||||
@ -10,6 +10,8 @@ import android.text.format.DateUtils;
|
||||
import android.text.style.RelativeSizeSpan;
|
||||
import android.util.Log;
|
||||
|
||||
import com.philliphsu.clock2.R;
|
||||
|
||||
import java.util.Formatter;
|
||||
import java.util.IllegalFormatException;
|
||||
import java.util.Locale;
|
||||
@ -1,4 +1,4 @@
|
||||
package com.philliphsu.clock2;
|
||||
package com.philliphsu.clock2.chronometer;
|
||||
|
||||
import android.app.NotificationManager;
|
||||
import android.app.PendingIntent;
|
||||
@ -13,6 +13,8 @@ import android.support.annotation.Nullable;
|
||||
import android.support.v4.app.NotificationCompat;
|
||||
import android.support.v4.util.SimpleArrayMap;
|
||||
|
||||
import com.philliphsu.clock2.R;
|
||||
|
||||
/**
|
||||
* Created by Phillip Hsu on 9/10/2016.
|
||||
*/
|
||||
@ -1,4 +1,4 @@
|
||||
package com.philliphsu.clock2;
|
||||
package com.philliphsu.clock2.chronometer;
|
||||
|
||||
import android.annotation.SuppressLint;
|
||||
import android.app.NotificationManager;
|
||||
@ -1,11 +1,9 @@
|
||||
package com.philliphsu.clock2;
|
||||
package com.philliphsu.clock2.data;
|
||||
|
||||
import android.content.Context;
|
||||
import android.os.AsyncTask;
|
||||
|
||||
import com.philliphsu.clock2.list.ScrollHandler;
|
||||
import com.philliphsu.clock2.model.DatabaseTableManager;
|
||||
import com.philliphsu.clock2.model.ObjectWithId;
|
||||
|
||||
/**
|
||||
* Created by Phillip Hsu on 7/1/2016.
|
||||
@ -1,4 +1,4 @@
|
||||
package com.philliphsu.clock2.model;
|
||||
package com.philliphsu.clock2.data;
|
||||
|
||||
import android.database.Cursor;
|
||||
import android.database.CursorWrapper;
|
||||
@ -1,4 +1,4 @@
|
||||
package com.philliphsu.clock2.model;
|
||||
package com.philliphsu.clock2.data;
|
||||
|
||||
import android.content.Context;
|
||||
import android.database.sqlite.SQLiteDatabase;
|
||||
@ -1,4 +1,4 @@
|
||||
package com.philliphsu.clock2.model;
|
||||
package com.philliphsu.clock2.data;
|
||||
|
||||
import android.content.ContentValues;
|
||||
import android.content.Context;
|
||||
@ -1,4 +1,4 @@
|
||||
package com.philliphsu.clock2.model;
|
||||
package com.philliphsu.clock2.data;
|
||||
|
||||
/**
|
||||
* Created by Phillip Hsu on 7/29/2016.
|
||||
@ -1,4 +1,4 @@
|
||||
package com.philliphsu.clock2.model;
|
||||
package com.philliphsu.clock2.data;
|
||||
|
||||
import android.content.BroadcastReceiver;
|
||||
import android.content.Context;
|
||||
@ -1,4 +1,4 @@
|
||||
package com.philliphsu.clock2;
|
||||
package com.philliphsu.clock2.dialogs;
|
||||
|
||||
import android.content.Context;
|
||||
import android.preference.PreferenceManager;
|
||||
@ -6,7 +6,7 @@ import android.support.v4.app.FragmentManager;
|
||||
import android.text.format.DateFormat;
|
||||
import android.util.Log;
|
||||
|
||||
import com.philliphsu.clock2.dialogs.DialogFragmentController;
|
||||
import com.philliphsu.clock2.R;
|
||||
import com.philliphsu.clock2.timepickers.BaseTimePickerDialog;
|
||||
import com.philliphsu.clock2.timepickers.NumberGridTimePickerDialog;
|
||||
import com.philliphsu.clock2.timepickers.NumpadTimePickerDialog;
|
||||
@ -4,8 +4,8 @@ import android.support.v7.widget.RecyclerView;
|
||||
import android.util.Log;
|
||||
import android.view.ViewGroup;
|
||||
|
||||
import com.philliphsu.clock2.model.BaseItemCursor;
|
||||
import com.philliphsu.clock2.model.ObjectWithId;
|
||||
import com.philliphsu.clock2.data.BaseItemCursor;
|
||||
import com.philliphsu.clock2.data.ObjectWithId;
|
||||
|
||||
/**
|
||||
* Created by Phillip Hsu on 7/29/2016.
|
||||
|
||||
@ -17,8 +17,8 @@ import android.widget.TextView;
|
||||
import com.philliphsu.clock2.BaseFragment;
|
||||
import com.philliphsu.clock2.R;
|
||||
import com.philliphsu.clock2.timepickers.Utils;
|
||||
import com.philliphsu.clock2.model.BaseItemCursor;
|
||||
import com.philliphsu.clock2.model.ObjectWithId;
|
||||
import com.philliphsu.clock2.data.BaseItemCursor;
|
||||
import com.philliphsu.clock2.data.ObjectWithId;
|
||||
|
||||
import butterknife.Bind;
|
||||
|
||||
|
||||
@ -2,7 +2,7 @@ package com.philliphsu.clock2.stopwatch;
|
||||
|
||||
import android.os.SystemClock;
|
||||
|
||||
import com.philliphsu.clock2.model.ObjectWithId;
|
||||
import com.philliphsu.clock2.data.ObjectWithId;
|
||||
|
||||
/**
|
||||
* Created by Phillip Hsu on 8/8/2016.
|
||||
|
||||
@ -9,10 +9,10 @@ import android.support.annotation.NonNull;
|
||||
import android.support.annotation.Nullable;
|
||||
import android.util.Log;
|
||||
|
||||
import com.philliphsu.clock2.ChronometerNotificationService;
|
||||
import com.philliphsu.clock2.chronometer.ChronometerNotificationService;
|
||||
import com.philliphsu.clock2.MainActivity;
|
||||
import com.philliphsu.clock2.R;
|
||||
import com.philliphsu.clock2.ChronometerDelegate;
|
||||
import com.philliphsu.clock2.chronometer.ChronometerDelegate;
|
||||
import com.philliphsu.clock2.stopwatch.data.AsyncLapsTableUpdateHandler;
|
||||
import com.philliphsu.clock2.stopwatch.ui.StopwatchFragment;
|
||||
|
||||
|
||||
@ -3,7 +3,7 @@ package com.philliphsu.clock2.stopwatch.data;
|
||||
import android.content.Context;
|
||||
import android.content.Intent;
|
||||
|
||||
import com.philliphsu.clock2.AsyncDatabaseTableUpdateHandler;
|
||||
import com.philliphsu.clock2.data.AsyncDatabaseTableUpdateHandler;
|
||||
import com.philliphsu.clock2.list.ScrollHandler;
|
||||
import com.philliphsu.clock2.stopwatch.Lap;
|
||||
import com.philliphsu.clock2.stopwatch.StopwatchNotificationService;
|
||||
|
||||
@ -2,7 +2,7 @@ package com.philliphsu.clock2.stopwatch.data;
|
||||
|
||||
import android.database.Cursor;
|
||||
|
||||
import com.philliphsu.clock2.model.BaseItemCursor;
|
||||
import com.philliphsu.clock2.data.BaseItemCursor;
|
||||
import com.philliphsu.clock2.stopwatch.Lap;
|
||||
|
||||
/**
|
||||
|
||||
@ -2,18 +2,15 @@ package com.philliphsu.clock2.stopwatch.data;
|
||||
|
||||
import android.content.Context;
|
||||
|
||||
import com.philliphsu.clock2.model.SQLiteCursorLoader;
|
||||
import com.philliphsu.clock2.data.SQLiteCursorLoader;
|
||||
import com.philliphsu.clock2.stopwatch.Lap;
|
||||
import com.philliphsu.clock2.stopwatch.data.LapCursor;
|
||||
import com.philliphsu.clock2.stopwatch.data.LapsTableManager;
|
||||
|
||||
/**
|
||||
* Created by Phillip Hsu on 8/9/2016.
|
||||
*/
|
||||
public class LapsCursorLoader extends SQLiteCursorLoader<Lap, LapCursor> {
|
||||
public static final String ACTION_CHANGE_CONTENT
|
||||
// TODO: Correct package prefix
|
||||
= "com.philliphsu.clock2.model.LapsCursorLoader.action.CHANGE_CONTENT";
|
||||
= "com.philliphsu.clock2.stopwatch.data.action.CHANGE_CONTENT";
|
||||
|
||||
public LapsCursorLoader(Context context) {
|
||||
super(context);
|
||||
|
||||
@ -4,7 +4,7 @@ import android.content.ContentValues;
|
||||
import android.content.Context;
|
||||
import android.database.Cursor;
|
||||
|
||||
import com.philliphsu.clock2.model.DatabaseTableManager;
|
||||
import com.philliphsu.clock2.data.DatabaseTableManager;
|
||||
import com.philliphsu.clock2.stopwatch.Lap;
|
||||
|
||||
/**
|
||||
|
||||
@ -20,7 +20,7 @@ import android.annotation.TargetApi;
|
||||
import android.content.Context;
|
||||
import android.util.AttributeSet;
|
||||
|
||||
import com.philliphsu.clock2.BaseChronometer;
|
||||
import com.philliphsu.clock2.chronometer.BaseChronometer;
|
||||
|
||||
/**
|
||||
* Created by Phillip Hsu on 8/9/2016.
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
package com.philliphsu.clock2.timers.ui;
|
||||
package com.philliphsu.clock2.timers;
|
||||
|
||||
import android.content.Intent;
|
||||
import android.os.Bundle;
|
||||
@ -5,7 +5,7 @@ import android.os.Parcelable;
|
||||
import android.os.SystemClock;
|
||||
|
||||
import com.google.auto.value.AutoValue;
|
||||
import com.philliphsu.clock2.model.ObjectWithId;
|
||||
import com.philliphsu.clock2.data.ObjectWithId;
|
||||
|
||||
import java.util.concurrent.TimeUnit;
|
||||
|
||||
|
||||
@ -9,7 +9,7 @@ import android.support.v4.util.SimpleArrayMap;
|
||||
import android.util.Log;
|
||||
|
||||
import com.philliphsu.clock2.timers.data.AsyncTimersTableUpdateHandler;
|
||||
import com.philliphsu.clock2.ChronometerNotificationService;
|
||||
import com.philliphsu.clock2.chronometer.ChronometerNotificationService;
|
||||
import com.philliphsu.clock2.MainActivity;
|
||||
import com.philliphsu.clock2.R;
|
||||
import com.philliphsu.clock2.timers.data.TimerCursor;
|
||||
|
||||
@ -6,7 +6,7 @@ import android.content.Context;
|
||||
import android.content.Intent;
|
||||
import android.util.Log;
|
||||
|
||||
import com.philliphsu.clock2.AsyncDatabaseTableUpdateHandler;
|
||||
import com.philliphsu.clock2.data.AsyncDatabaseTableUpdateHandler;
|
||||
import com.philliphsu.clock2.timers.Timer;
|
||||
import com.philliphsu.clock2.list.ScrollHandler;
|
||||
import com.philliphsu.clock2.timers.TimerNotificationService;
|
||||
|
||||
@ -3,7 +3,7 @@ package com.philliphsu.clock2.timers.data;
|
||||
import android.database.Cursor;
|
||||
|
||||
import com.philliphsu.clock2.timers.Timer;
|
||||
import com.philliphsu.clock2.model.BaseItemCursor;
|
||||
import com.philliphsu.clock2.data.BaseItemCursor;
|
||||
|
||||
/**
|
||||
* Created by Phillip Hsu on 7/30/2016.
|
||||
|
||||
@ -3,7 +3,7 @@ package com.philliphsu.clock2.timers.data;
|
||||
import android.content.Context;
|
||||
|
||||
import com.philliphsu.clock2.timers.Timer;
|
||||
import com.philliphsu.clock2.model.SQLiteCursorLoader;
|
||||
import com.philliphsu.clock2.data.SQLiteCursorLoader;
|
||||
|
||||
/**
|
||||
* Created by Phillip Hsu on 7/29/2016.
|
||||
|
||||
@ -7,7 +7,7 @@ import android.os.SystemClock;
|
||||
import android.util.Log;
|
||||
|
||||
import com.philliphsu.clock2.timers.Timer;
|
||||
import com.philliphsu.clock2.model.DatabaseTableManager;
|
||||
import com.philliphsu.clock2.data.DatabaseTableManager;
|
||||
|
||||
/**
|
||||
* Created by Phillip Hsu on 7/30/2016.
|
||||
|
||||
@ -20,7 +20,7 @@ import android.annotation.TargetApi;
|
||||
import android.content.Context;
|
||||
import android.util.AttributeSet;
|
||||
|
||||
import com.philliphsu.clock2.BaseChronometer;
|
||||
import com.philliphsu.clock2.chronometer.BaseChronometer;
|
||||
|
||||
/**
|
||||
* Created by Phillip Hsu on 7/25/2016.
|
||||
|
||||
@ -14,6 +14,7 @@ import android.view.LayoutInflater;
|
||||
import android.view.View;
|
||||
import android.view.ViewGroup;
|
||||
|
||||
import com.philliphsu.clock2.timers.EditTimerActivity;
|
||||
import com.philliphsu.clock2.timers.data.AsyncTimersTableUpdateHandler;
|
||||
import com.philliphsu.clock2.R;
|
||||
import com.philliphsu.clock2.list.RecyclerViewFragment;
|
||||
|
||||
@ -6,7 +6,7 @@
|
||||
android:layout_height="match_parent"
|
||||
android:orientation="vertical"
|
||||
xmlns:app="http://schemas.android.com/apk/res-auto"
|
||||
tools:context=".timers.ui.EditTimerActivity">
|
||||
tools:context=".timers.EditTimerActivity">
|
||||
|
||||
<android.support.v7.widget.Toolbar
|
||||
android:id="@+id/toolbar"
|
||||
|
||||
@ -5,7 +5,7 @@
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
xmlns:app="http://schemas.android.com/apk/res-auto"
|
||||
tools:context=".timers.ui.EditTimerActivity">
|
||||
tools:context=".timers.EditTimerActivity">
|
||||
|
||||
<RelativeLayout
|
||||
android:id="@+id/edit_fields_layout"
|
||||
|
||||
Loading…
Reference in New Issue
Block a user