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

Create .timers.ui package, and move TimerRingtoneService and TimesUpActivity to ringtone package

Browse Source
This commit is contained in:
Phillip Hsu 2016-09-21 17:26:16 -07:00
parent 01650a531f
commit d9307f305e
9 changed files with 19 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -74,7 +74,7 @@
</service>
<activity
android:name=".timers.TimesUpActivity"
android:name=".ringtone.TimesUpActivity"
android:excludeFromRecents="true"
android:label="@string/title_activity_ringtone"
android:launchMode="singleTask"
@ -94,7 +94,7 @@
android:exported="false">
</service>
<service
android:name=".timers.TimerRingtoneService"
android:name=".ringtone.TimerRingtoneService"
android:enabled="true"
android:exported="false">
</service>

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

@ -23,7 +23,7 @@ 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.timers.TimersFragment;
import com.philliphsu.clock2.timers.ui.TimersFragment;
import butterknife.Bind;

7
app/src/main/java/com/philliphsu/clock2/timers/TimerRingtoneService.java → app/src/main/java/com/philliphsu/clock2/ringtone/TimerRingtoneService.java
View File

@ -1,4 +1,4 @@
package com.philliphsu.clock2.timers;
package com.philliphsu.clock2.ringtone;
import android.app.Notification;
import android.content.Intent;
@ -7,10 +7,11 @@ import android.preference.PreferenceManager;
import android.provider.Settings;
import android.support.v4.app.NotificationCompat;
import com.philliphsu.clock2.timers.data.AsyncTimersTableUpdateHandler;
import com.philliphsu.clock2.R;
import com.philliphsu.clock2.Timer;
import com.philliphsu.clock2.ringtone.RingtoneService;
import com.philliphsu.clock2.timers.TimerController;
import com.philliphsu.clock2.timers.TimerNotificationService;
import com.philliphsu.clock2.timers.data.AsyncTimersTableUpdateHandler;
public class TimerRingtoneService extends RingtoneService<Timer> {
private static final String TAG = "TimerRingtoneService";

7
app/src/main/java/com/philliphsu/clock2/timers/TimesUpActivity.java → app/src/main/java/com/philliphsu/clock2/ringtone/TimesUpActivity.java
View File

@ -1,4 +1,4 @@
package com.philliphsu.clock2.timers;
package com.philliphsu.clock2.ringtone;
import android.app.Notification;
import android.app.NotificationManager;
@ -8,11 +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.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.ringtone.RingtoneActivity;
import com.philliphsu.clock2.ringtone.RingtoneService;
public class TimesUpActivity extends RingtoneActivity<Timer> {
private static final String TAG = "TimesUpActivity";

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

@ -14,6 +14,7 @@ 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;
/**
* Handles the notification for an active Timer.

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

@ -10,7 +10,7 @@ import com.philliphsu.clock2.AsyncDatabaseTableUpdateHandler;
import com.philliphsu.clock2.Timer;
import com.philliphsu.clock2.list.ScrollHandler;
import com.philliphsu.clock2.timers.TimerNotificationService;
import com.philliphsu.clock2.timers.TimesUpActivity;
import com.philliphsu.clock2.ringtone.TimesUpActivity;
/**
* Created by Phillip Hsu on 8/2/2016.

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

@ -1,4 +1,4 @@
package com.philliphsu.clock2.timers;
package com.philliphsu.clock2.timers.ui;
import android.animation.ObjectAnimator;
import android.content.Intent;
@ -17,6 +17,9 @@ 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;

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

@ -1,4 +1,4 @@
package com.philliphsu.clock2.timers;
package com.philliphsu.clock2.timers.ui;
import android.view.ViewGroup;

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

@ -1,4 +1,4 @@
package com.philliphsu.clock2.timers;
package com.philliphsu.clock2.timers.ui;
import android.app.Activity;