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

New ringtone.playback package, tidy up stopwatch package

Browse Source
This commit is contained in:
Phillip Hsu 2016-09-21 17:53:15 -07:00
parent e38774d45e
commit 24dd975536
26 changed files with 48 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -89,12 +89,12 @@
</activity>
<service
android:name=".ringtone.AlarmRingtoneService"
android:name=".ringtone.playback.AlarmRingtoneService"
android:enabled="true"
android:exported="false">
</service>
<service
android:name=".ringtone.TimerRingtoneService"
android:name=".ringtone.playback.TimerRingtoneService"
android:enabled="true"
android:exported="false">
</service>

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

@ -22,7 +22,7 @@ import android.widget.TextView;
import com.philliphsu.clock2.alarms.ui.AlarmsFragment;
import com.philliphsu.clock2.list.RecyclerViewFragment;
import com.philliphsu.clock2.settings.SettingsActivity;
import com.philliphsu.clock2.stopwatch.StopwatchFragment;
import com.philliphsu.clock2.stopwatch.ui.StopwatchFragment;
import com.philliphsu.clock2.timers.ui.TimersFragment;
import butterknife.Bind;

2
app/src/main/java/com/philliphsu/clock2/alarms/misc/AlarmController.java
View File

@ -11,7 +11,7 @@ import android.view.View;
import com.philliphsu.clock2.R;
import com.philliphsu.clock2.alarms.Alarm;
import com.philliphsu.clock2.ringtone.AlarmActivity;
import com.philliphsu.clock2.ringtone.AlarmRingtoneService;
import com.philliphsu.clock2.ringtone.playback.AlarmRingtoneService;
import com.philliphsu.clock2.alarms.background.PendingAlarmScheduler;
import com.philliphsu.clock2.alarms.background.UpcomingAlarmReceiver;
import com.philliphsu.clock2.alarms.data.AlarmsTableManager;

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

@ -9,7 +9,7 @@ import android.support.annotation.Nullable;
import android.support.v7.app.AlertDialog;
import com.philliphsu.clock2.R;
import com.philliphsu.clock2.ringtone.RingtoneLoop;
import com.philliphsu.clock2.ringtone.playback.RingtoneLoop;
/**
* Created by Phillip Hsu on 9/3/2016.

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

@ -5,7 +5,7 @@ import android.database.sqlite.SQLiteDatabase;
import android.database.sqlite.SQLiteOpenHelper;
import com.philliphsu.clock2.alarms.data.AlarmsTable;
import com.philliphsu.clock2.stopwatch.LapsTable;
import com.philliphsu.clock2.stopwatch.data.LapsTable;
import com.philliphsu.clock2.timers.data.TimersTable;
/**

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

@ -10,6 +10,8 @@ import android.view.ViewGroup;
import com.philliphsu.clock2.R;
import com.philliphsu.clock2.alarms.Alarm;
import com.philliphsu.clock2.alarms.misc.AlarmController;
import com.philliphsu.clock2.ringtone.playback.AlarmRingtoneService;
import com.philliphsu.clock2.ringtone.playback.RingtoneService;
import com.philliphsu.clock2.util.TimeFormatUtils;
public class AlarmActivity extends RingtoneActivity<Alarm> {

1
app/src/main/java/com/philliphsu/clock2/ringtone/RingtoneActivity.java
View File

@ -16,6 +16,7 @@ import android.widget.TextView;
import com.philliphsu.clock2.BaseActivity;
import com.philliphsu.clock2.R;
import com.philliphsu.clock2.ringtone.playback.RingtoneService;
import com.philliphsu.clock2.util.LocalBroadcastHelper;
import butterknife.Bind;

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

@ -8,6 +8,8 @@ import android.os.SystemClock;
import android.support.v4.app.NotificationCompat;
import android.view.ViewGroup;
import com.philliphsu.clock2.ringtone.playback.RingtoneService;
import com.philliphsu.clock2.ringtone.playback.TimerRingtoneService;
import com.philliphsu.clock2.timers.ui.CountdownChronometer;
import com.philliphsu.clock2.timers.TimerController;
import com.philliphsu.clock2.timers.TimerNotificationService;

2
app/src/main/java/com/philliphsu/clock2/ringtone/AlarmRingtoneService.java → app/src/main/java/com/philliphsu/clock2/ringtone/playback/AlarmRingtoneService.java
View File

@ -1,4 +1,4 @@
package com.philliphsu.clock2.ringtone;
package com.philliphsu.clock2.ringtone.playback;
import android.app.Notification;
import android.content.Intent;

2
app/src/main/java/com/philliphsu/clock2/ringtone/RingtoneLoop.java → app/src/main/java/com/philliphsu/clock2/ringtone/playback/RingtoneLoop.java
View File

@ -1,4 +1,4 @@
package com.philliphsu.clock2.ringtone;
package com.philliphsu.clock2.ringtone.playback;
import android.content.Context;
import android.media.AudioManager;

3
app/src/main/java/com/philliphsu/clock2/ringtone/RingtoneService.java → app/src/main/java/com/philliphsu/clock2/ringtone/playback/RingtoneService.java
View File

@ -1,4 +1,4 @@
package com.philliphsu.clock2.ringtone;
package com.philliphsu.clock2.ringtone.playback;
import android.app.Notification;
import android.app.PendingIntent;
@ -16,6 +16,7 @@ import android.support.annotation.NonNull;
import android.util.Log;
import com.philliphsu.clock2.R;
import com.philliphsu.clock2.ringtone.RingtoneActivity;
import com.philliphsu.clock2.util.LocalBroadcastHelper;
import java.util.concurrent.TimeUnit;

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

@ -1,4 +1,4 @@
package com.philliphsu.clock2.ringtone;
package com.philliphsu.clock2.ringtone.playback;
import android.app.Notification;
import android.content.Intent;

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

@ -13,6 +13,8 @@ import com.philliphsu.clock2.ChronometerNotificationService;
import com.philliphsu.clock2.MainActivity;
import com.philliphsu.clock2.R;
import com.philliphsu.clock2.ChronometerDelegate;
import com.philliphsu.clock2.stopwatch.data.AsyncLapsTableUpdateHandler;
import com.philliphsu.clock2.stopwatch.ui.StopwatchFragment;
public class StopwatchNotificationService extends ChronometerNotificationService {
private static final String TAG = "StopwatchNotifService";

4
app/src/main/java/com/philliphsu/clock2/stopwatch/AsyncLapsTableUpdateHandler.java → app/src/main/java/com/philliphsu/clock2/stopwatch/data/AsyncLapsTableUpdateHandler.java
View File

@ -1,10 +1,12 @@
package com.philliphsu.clock2.stopwatch;
package com.philliphsu.clock2.stopwatch.data;
import android.content.Context;
import android.content.Intent;
import com.philliphsu.clock2.AsyncDatabaseTableUpdateHandler;
import com.philliphsu.clock2.list.ScrollHandler;
import com.philliphsu.clock2.stopwatch.Lap;
import com.philliphsu.clock2.stopwatch.StopwatchNotificationService;
/**
* Created by Phillip Hsu on 8/9/2016.

3
app/src/main/java/com/philliphsu/clock2/stopwatch/LapCursor.java → app/src/main/java/com/philliphsu/clock2/stopwatch/data/LapCursor.java
View File

@ -1,8 +1,9 @@
package com.philliphsu.clock2.stopwatch;
package com.philliphsu.clock2.stopwatch.data;
import android.database.Cursor;
import com.philliphsu.clock2.model.BaseItemCursor;
import com.philliphsu.clock2.stopwatch.Lap;
/**
* Created by Phillip Hsu on 8/8/2016.

5
app/src/main/java/com/philliphsu/clock2/stopwatch/LapsCursorLoader.java → app/src/main/java/com/philliphsu/clock2/stopwatch/data/LapsCursorLoader.java
View File

@ -1,8 +1,11 @@
package com.philliphsu.clock2.stopwatch;
package com.philliphsu.clock2.stopwatch.data;
import android.content.Context;
import com.philliphsu.clock2.model.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.

2
app/src/main/java/com/philliphsu/clock2/stopwatch/LapsTable.java → app/src/main/java/com/philliphsu/clock2/stopwatch/data/LapsTable.java
View File

@ -1,4 +1,4 @@
package com.philliphsu.clock2.stopwatch;
package com.philliphsu.clock2.stopwatch.data;
import android.database.sqlite.SQLiteDatabase;

3
app/src/main/java/com/philliphsu/clock2/stopwatch/LapsTableManager.java → app/src/main/java/com/philliphsu/clock2/stopwatch/data/LapsTableManager.java
View File

@ -1,10 +1,11 @@
package com.philliphsu.clock2.stopwatch;
package com.philliphsu.clock2.stopwatch.data;
import android.content.ContentValues;
import android.content.Context;
import android.database.Cursor;
import com.philliphsu.clock2.model.DatabaseTableManager;
import com.philliphsu.clock2.stopwatch.Lap;
/**
* Created by Phillip Hsu on 8/8/2016.

2
app/src/main/java/com/philliphsu/clock2/stopwatch/ChronometerWithMillis.java → app/src/main/java/com/philliphsu/clock2/stopwatch/ui/ChronometerWithMillis.java
View File

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

3
app/src/main/java/com/philliphsu/clock2/stopwatch/LapViewHolder.java → app/src/main/java/com/philliphsu/clock2/stopwatch/ui/LapViewHolder.java
View File

@ -1,4 +1,4 @@
package com.philliphsu.clock2.stopwatch;
package com.philliphsu.clock2.stopwatch.ui;
import android.view.View;
import android.view.ViewGroup;
@ -6,6 +6,7 @@ import android.widget.TextView;
import com.philliphsu.clock2.list.BaseViewHolder;
import com.philliphsu.clock2.R;
import com.philliphsu.clock2.stopwatch.Lap;
import butterknife.Bind;

4
app/src/main/java/com/philliphsu/clock2/stopwatch/LapsAdapter.java → app/src/main/java/com/philliphsu/clock2/stopwatch/ui/LapsAdapter.java
View File

@ -1,9 +1,11 @@
package com.philliphsu.clock2.stopwatch;
package com.philliphsu.clock2.stopwatch.ui;
import android.view.ViewGroup;
import com.philliphsu.clock2.list.BaseCursorAdapter;
import com.philliphsu.clock2.list.OnListItemInteractionListener;
import com.philliphsu.clock2.stopwatch.Lap;
import com.philliphsu.clock2.stopwatch.data.LapCursor;
/**
* Created by Phillip Hsu on 8/9/2016.

12
app/src/main/java/com/philliphsu/clock2/stopwatch/StopwatchFragment.java → app/src/main/java/com/philliphsu/clock2/stopwatch/ui/StopwatchFragment.java
View File

@ -1,4 +1,4 @@
package com.philliphsu.clock2.stopwatch;
package com.philliphsu.clock2.stopwatch.ui;
import android.animation.Animator;
import android.animation.ObjectAnimator;
@ -21,6 +21,10 @@ import android.widget.SeekBar;
import com.philliphsu.clock2.R;
import com.philliphsu.clock2.list.RecyclerViewFragment;
import com.philliphsu.clock2.stopwatch.Lap;
import com.philliphsu.clock2.stopwatch.StopwatchNotificationService;
import com.philliphsu.clock2.stopwatch.data.LapCursor;
import com.philliphsu.clock2.stopwatch.data.LapsCursorLoader;
import com.philliphsu.clock2.util.ProgressBarUtils;
import java.lang.ref.WeakReference;
@ -39,9 +43,9 @@ public class StopwatchFragment extends RecyclerViewFragment<
private static final String TAG = "StopwatchFragment";
// Exposed for StopwatchNotificationService
static final String KEY_START_TIME = "start_time";
static final String KEY_PAUSE_TIME = "pause_time";
static final String KEY_CHRONOMETER_RUNNING = "chronometer_running";
public static final String KEY_START_TIME = "start_time";
public static final String KEY_PAUSE_TIME = "pause_time";
public static final String KEY_CHRONOMETER_RUNNING = "chronometer_running";
private ObjectAnimator mProgressAnimator;
private SharedPreferences mPrefs;

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

@ -18,7 +18,7 @@ import android.widget.TextView;
import com.philliphsu.clock2.dialogs.AddLabelDialog;
import com.philliphsu.clock2.dialogs.AddLabelDialogController;
import com.philliphsu.clock2.timers.TimerController;
import com.philliphsu.clock2.ringtone.TimerRingtoneService;
import com.philliphsu.clock2.ringtone.playback.TimerRingtoneService;
import com.philliphsu.clock2.timers.data.AsyncTimersTableUpdateHandler;
import com.philliphsu.clock2.list.BaseViewHolder;
import com.philliphsu.clock2.list.OnListItemInteractionListener;

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

@ -15,7 +15,7 @@
android:orientation="horizontal"
android:layout_above="@+id/mini_fab_layout">
<com.philliphsu.clock2.stopwatch.ChronometerWithMillis
<com.philliphsu.clock2.stopwatch.ui.ChronometerWithMillis
android:id="@+id/chronometer"
android:layout_width="0dp"
android:layout_height="match_parent"

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

@ -10,7 +10,7 @@
android:layout_height="match_parent"
android:orientation="vertical">
<com.philliphsu.clock2.stopwatch.ChronometerWithMillis
<com.philliphsu.clock2.stopwatch.ui.ChronometerWithMillis
android:id="@+id/chronometer"
android:layout_width="match_parent"
android:layout_height="wrap_content"

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

@ -12,7 +12,7 @@
android:gravity="center"
style="@style/TextAppearance.AppCompat"/>
<com.philliphsu.clock2.stopwatch.ChronometerWithMillis
<com.philliphsu.clock2.stopwatch.ui.ChronometerWithMillis
android:id="@+id/elapsed_time"
android:layout_width="0dp"
android:layout_height="match_parent"