hollorol/Clockplus
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Move more classes to timers package

Browse Source
This commit is contained in:
Phillip Hsu 2016-09-21 17:46:29 -07:00
parent d9307f305e
commit e38774d45e
26 changed files with 29 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/AndroidManifest.xml
View File

@ -59,7 +59,7 @@
</service>
<activity
android:name=".edittimer.EditTimerActivity"
android:name=".timers.ui.EditTimerActivity"
android:label="@string/title_activity_create_timer"
android:parentActivityName=".MainActivity"
android:windowSoftInputMode="adjustNothing">

2
app/src/main/java/com/philliphsu/clock2/BaseChronometer.java
View File

@ -8,8 +8,6 @@ import android.util.Log;
import android.view.View;
import android.widget.TextView;
import com.philliphsu.clock2.timers.ChronometerDelegate;
/**
* Created by Phillip Hsu on 9/9/2016.
*

4
app/src/main/java/com/philliphsu/clock2/timers/ChronometerDelegate.java → app/src/main/java/com/philliphsu/clock2/ChronometerDelegate.java
View File

@ -1,4 +1,4 @@
package com.philliphsu.clock2.timers;
package com.philliphsu.clock2;
import android.content.res.Resources;
import android.os.SystemClock;
@ -10,8 +10,6 @@ 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;

2
app/src/main/java/com/philliphsu/clock2/ChronometerNotificationService.java
View File

@ -13,8 +13,6 @@ import android.support.annotation.Nullable;
import android.support.v4.app.NotificationCompat;
import android.support.v4.util.SimpleArrayMap;
import com.philliphsu.clock2.timers.ChronometerDelegate;
/**
* Created by Phillip Hsu on 9/10/2016.
*/

2
app/src/main/java/com/philliphsu/clock2/ChronometerNotificationThread.java
View File

@ -11,8 +11,6 @@ import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import android.support.v4.app.NotificationCompat;
import com.philliphsu.clock2.timers.ChronometerDelegate;
/**
* Created by Phillip Hsu on 9/10/2016.
*

2
app/src/main/java/com/philliphsu/clock2/ringtone/TimerRingtoneService.java
View File

@ -8,7 +8,7 @@ import android.provider.Settings;
import android.support.v4.app.NotificationCompat;
import com.philliphsu.clock2.R;
import com.philliphsu.clock2.Timer;
import com.philliphsu.clock2.timers.Timer;
import com.philliphsu.clock2.timers.TimerController;
import com.philliphsu.clock2.timers.TimerNotificationService;
import com.philliphsu.clock2.timers.data.AsyncTimersTableUpdateHandler;

4
app/src/main/java/com/philliphsu/clock2/ringtone/TimesUpActivity.java
View File

@ -8,12 +8,12 @@ import android.os.SystemClock;
import android.support.v4.app.NotificationCompat;
import android.view.ViewGroup;
import com.philliphsu.clock2.timers.CountdownChronometer;
import com.philliphsu.clock2.timers.ui.CountdownChronometer;
import com.philliphsu.clock2.timers.TimerController;
import com.philliphsu.clock2.timers.TimerNotificationService;
import com.philliphsu.clock2.timers.data.AsyncTimersTableUpdateHandler;
import com.philliphsu.clock2.R;
import com.philliphsu.clock2.Timer;
import com.philliphsu.clock2.timers.Timer;
public class TimesUpActivity extends RingtoneActivity<Timer> {
private static final String TAG = "TimesUpActivity";

2
app/src/main/java/com/philliphsu/clock2/stopwatch/StopwatchNotificationService.java
View File

@ -12,7 +12,7 @@ import android.util.Log;
import com.philliphsu.clock2.ChronometerNotificationService;
import com.philliphsu.clock2.MainActivity;
import com.philliphsu.clock2.R;
import com.philliphsu.clock2.timers.ChronometerDelegate;
import com.philliphsu.clock2.ChronometerDelegate;
public class StopwatchNotificationService extends ChronometerNotificationService {
private static final String TAG = "StopwatchNotifService";

2
app/src/main/java/com/philliphsu/clock2/Timer.java → app/src/main/java/com/philliphsu/clock2/timers/Timer.java
View File

@ -1,4 +1,4 @@
package com.philliphsu.clock2;
package com.philliphsu.clock2.timers;
import android.os.Parcel;
import android.os.Parcelable;

1
app/src/main/java/com/philliphsu/clock2/timers/TimerController.java
View File

@ -3,7 +3,6 @@ package com.philliphsu.clock2.timers;
import android.util.Log;
import com.philliphsu.clock2.timers.data.AsyncTimersTableUpdateHandler;
import com.philliphsu.clock2.Timer;
/**
* Created by Phillip Hsu on 7/27/2016.

1
app/src/main/java/com/philliphsu/clock2/timers/TimerNotificationService.java
View File

@ -12,7 +12,6 @@ import com.philliphsu.clock2.timers.data.AsyncTimersTableUpdateHandler;
import com.philliphsu.clock2.ChronometerNotificationService;
import com.philliphsu.clock2.MainActivity;
import com.philliphsu.clock2.R;
import com.philliphsu.clock2.Timer;
import com.philliphsu.clock2.timers.data.TimerCursor;
import com.philliphsu.clock2.timers.ui.TimersFragment;

2
app/src/main/java/com/philliphsu/clock2/timers/data/AsyncTimersTableUpdateHandler.java
View File

@ -7,7 +7,7 @@ import android.content.Intent;
import android.util.Log;
import com.philliphsu.clock2.AsyncDatabaseTableUpdateHandler;
import com.philliphsu.clock2.Timer;
import com.philliphsu.clock2.timers.Timer;
import com.philliphsu.clock2.list.ScrollHandler;
import com.philliphsu.clock2.timers.TimerNotificationService;
import com.philliphsu.clock2.ringtone.TimesUpActivity;

2
app/src/main/java/com/philliphsu/clock2/timers/data/TimerCursor.java
View File

@ -2,7 +2,7 @@ package com.philliphsu.clock2.timers.data;
import android.database.Cursor;
import com.philliphsu.clock2.Timer;
import com.philliphsu.clock2.timers.Timer;
import com.philliphsu.clock2.model.BaseItemCursor;
/**

2
app/src/main/java/com/philliphsu/clock2/timers/data/TimersListCursorLoader.java
View File

@ -2,7 +2,7 @@ package com.philliphsu.clock2.timers.data;
import android.content.Context;
import com.philliphsu.clock2.Timer;
import com.philliphsu.clock2.timers.Timer;
import com.philliphsu.clock2.model.SQLiteCursorLoader;
/**

2
app/src/main/java/com/philliphsu/clock2/timers/data/TimersTableManager.java
View File

@ -6,7 +6,7 @@ import android.database.Cursor;
import android.os.SystemClock;
import android.util.Log;
import com.philliphsu.clock2.Timer;
import com.philliphsu.clock2.timers.Timer;
import com.philliphsu.clock2.model.DatabaseTableManager;
/**

2
app/src/main/java/com/philliphsu/clock2/timers/CountdownChronometer.java → app/src/main/java/com/philliphsu/clock2/timers/ui/CountdownChronometer.java
View File

@ -14,7 +14,7 @@
* limitations under the License.
*/
package com.philliphsu.clock2.timers;
package com.philliphsu.clock2.timers.ui;
import android.annotation.TargetApi;
import android.content.Context;

2
app/src/main/java/com/philliphsu/clock2/edittimer/EditTimerActivity.java → app/src/main/java/com/philliphsu/clock2/timers/ui/EditTimerActivity.java
View File

@ -1,4 +1,4 @@
package com.philliphsu.clock2.edittimer;
package com.philliphsu.clock2.timers.ui;
import android.content.Intent;
import android.os.Bundle;

3
app/src/main/java/com/philliphsu/clock2/timers/ui/TimerViewHolder.java
View File

@ -17,14 +17,13 @@ import android.widget.TextView;
import com.philliphsu.clock2.dialogs.AddLabelDialog;
import com.philliphsu.clock2.dialogs.AddLabelDialogController;
import com.philliphsu.clock2.timers.CountdownChronometer;
import com.philliphsu.clock2.timers.TimerController;
import com.philliphsu.clock2.ringtone.TimerRingtoneService;
import com.philliphsu.clock2.timers.data.AsyncTimersTableUpdateHandler;
import com.philliphsu.clock2.list.BaseViewHolder;
import com.philliphsu.clock2.list.OnListItemInteractionListener;
import com.philliphsu.clock2.R;
import com.philliphsu.clock2.Timer;
import com.philliphsu.clock2.timers.Timer;
import com.philliphsu.clock2.util.FragmentTagUtils;
import com.philliphsu.clock2.util.ProgressBarUtils;

2
app/src/main/java/com/philliphsu/clock2/timers/ui/TimersCursorAdapter.java
View File

@ -5,7 +5,7 @@ import android.view.ViewGroup;
import com.philliphsu.clock2.timers.data.AsyncTimersTableUpdateHandler;
import com.philliphsu.clock2.list.BaseCursorAdapter;
import com.philliphsu.clock2.list.OnListItemInteractionListener;
import com.philliphsu.clock2.Timer;
import com.philliphsu.clock2.timers.Timer;
import com.philliphsu.clock2.timers.data.TimerCursor;
/**

3
app/src/main/java/com/philliphsu/clock2/timers/ui/TimersFragment.java
View File

@ -17,8 +17,7 @@ import android.view.ViewGroup;
import com.philliphsu.clock2.timers.data.AsyncTimersTableUpdateHandler;
import com.philliphsu.clock2.R;
import com.philliphsu.clock2.list.RecyclerViewFragment;
import com.philliphsu.clock2.Timer;
import com.philliphsu.clock2.edittimer.EditTimerActivity;
import com.philliphsu.clock2.timers.Timer;
import com.philliphsu.clock2.timers.data.TimerCursor;
import com.philliphsu.clock2.timers.data.TimersListCursorLoader;

2
app/src/main/res/layout-land/activity_edit_timer.xml
View File

@ -6,7 +6,7 @@
android:layout_height="match_parent"
android:orientation="vertical"
xmlns:app="http://schemas.android.com/apk/res-auto"
tools:context="com.philliphsu.clock2.edittimer.EditTimerActivity">
tools:context=".timers.ui.EditTimerActivity">
<android.support.v7.widget.Toolbar
android:id="@+id/toolbar"

2
app/src/main/res/layout-land/item_timer.xml
View File

@ -14,7 +14,7 @@
android:id="@+id/label"
style="@style/TimerLabel"/>
<com.philliphsu.clock2.timers.CountdownChronometer
<com.philliphsu.clock2.timers.ui.CountdownChronometer
android:id="@+id/duration"
android:layout_below="@id/label"
style="@style/TimerText.Countdown"/>

2
app/src/main/res/layout/activity_edit_timer.xml
View File

@ -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="com.philliphsu.clock2.edittimer.EditTimerActivity">
tools:context=".timers.ui.EditTimerActivity">
<RelativeLayout
android:id="@+id/edit_fields_layout"

2
app/src/main/res/layout/content_header_timesup_activity.xml
View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<com.philliphsu.clock2.timers.CountdownChronometer
<com.philliphsu.clock2.timers.ui.CountdownChronometer
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="wrap_content"
android:layout_height="wrap_content"

2
app/src/main/res/layout/item_timer.xml
View File

@ -15,7 +15,7 @@
android:id="@+id/label"
style="@style/TimerLabel"/>
<com.philliphsu.clock2.timers.CountdownChronometer
<com.philliphsu.clock2.timers.ui.CountdownChronometer
android:id="@+id/duration"
android:layout_below="@id/label"
style="@style/TimerText.Countdown"/>

12
app/src/test/java/com/philliphsu/clock2/DaysOfWeekTest.java → app/src/test/java/com/philliphsu/clock2/alarms/misc/DaysOfWeekTest.java
View File

@ -1,10 +1,14 @@
package com.philliphsu.clock2;
import com.philliphsu.clock2.alarms.misc.DaysOfWeek;
package com.philliphsu.clock2.alarms.misc;
import org.junit.Test;
import static com.philliphsu.clock2.alarms.misc.DaysOfWeek.*;
import static com.philliphsu.clock2.alarms.misc.DaysOfWeek.FRIDAY;
import static com.philliphsu.clock2.alarms.misc.DaysOfWeek.MONDAY;
import static com.philliphsu.clock2.alarms.misc.DaysOfWeek.SATURDAY;
import static com.philliphsu.clock2.alarms.misc.DaysOfWeek.SUNDAY;
import static com.philliphsu.clock2.alarms.misc.DaysOfWeek.THURSDAY;
import static com.philliphsu.clock2.alarms.misc.DaysOfWeek.TUESDAY;
import static com.philliphsu.clock2.alarms.misc.DaysOfWeek.WEDNESDAY;
import static org.junit.Assert.assertEquals;
/**