From d9307f305ebc14041b68a5f7e2a897ee14ad8d08 Mon Sep 17 00:00:00 2001
From: Phillip Hsu <philliphsu@outlook.com>
Date: Wed, 21 Sep 2016 17:26:16 -0700
Subject: [PATCH] Create .timers.ui package, and move TimerRingtoneService and
 TimesUpActivity to ringtone package

---
 app/src/main/AndroidManifest.xml                           | 4 ++--
 app/src/main/java/com/philliphsu/clock2/MainActivity.java  | 2 +-
 .../clock2/{timers => ringtone}/TimerRingtoneService.java  | 7 ++++---
 .../clock2/{timers => ringtone}/TimesUpActivity.java       | 7 ++++---
 .../philliphsu/clock2/timers/TimerNotificationService.java | 1 +
 .../clock2/timers/data/AsyncTimersTableUpdateHandler.java  | 2 +-
 .../philliphsu/clock2/timers/{ => ui}/TimerViewHolder.java | 5 ++++-
 .../clock2/timers/{ => ui}/TimersCursorAdapter.java        | 2 +-
 .../philliphsu/clock2/timers/{ => ui}/TimersFragment.java  | 2 +-
 9 files changed, 19 insertions(+), 13 deletions(-)
 rename app/src/main/java/com/philliphsu/clock2/{timers => ringtone}/TimerRingtoneService.java (96%)
 rename app/src/main/java/com/philliphsu/clock2/{timers => ringtone}/TimesUpActivity.java (94%)
 rename app/src/main/java/com/philliphsu/clock2/timers/{ => ui}/TimerViewHolder.java (97%)
 rename app/src/main/java/com/philliphsu/clock2/timers/{ => ui}/TimersCursorAdapter.java (96%)
 rename app/src/main/java/com/philliphsu/clock2/timers/{ => ui}/TimersFragment.java (99%)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index dccb39c..1503fd3 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -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>
diff --git a/app/src/main/java/com/philliphsu/clock2/MainActivity.java b/app/src/main/java/com/philliphsu/clock2/MainActivity.java
index d9e44aa..6168055 100644
--- a/app/src/main/java/com/philliphsu/clock2/MainActivity.java
+++ b/app/src/main/java/com/philliphsu/clock2/MainActivity.java
@@ -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;
 
diff --git a/app/src/main/java/com/philliphsu/clock2/timers/TimerRingtoneService.java b/app/src/main/java/com/philliphsu/clock2/ringtone/TimerRingtoneService.java
similarity index 96%
rename from app/src/main/java/com/philliphsu/clock2/timers/TimerRingtoneService.java
rename to app/src/main/java/com/philliphsu/clock2/ringtone/TimerRingtoneService.java
index 8968cfd..53ee38d 100644
--- a/app/src/main/java/com/philliphsu/clock2/timers/TimerRingtoneService.java
+++ b/app/src/main/java/com/philliphsu/clock2/ringtone/TimerRingtoneService.java
@@ -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";
diff --git a/app/src/main/java/com/philliphsu/clock2/timers/TimesUpActivity.java b/app/src/main/java/com/philliphsu/clock2/ringtone/TimesUpActivity.java
similarity index 94%
rename from app/src/main/java/com/philliphsu/clock2/timers/TimesUpActivity.java
rename to app/src/main/java/com/philliphsu/clock2/ringtone/TimesUpActivity.java
index 765f5ca..f6a9fe3 100644
--- a/app/src/main/java/com/philliphsu/clock2/timers/TimesUpActivity.java
+++ b/app/src/main/java/com/philliphsu/clock2/ringtone/TimesUpActivity.java
@@ -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";
diff --git a/app/src/main/java/com/philliphsu/clock2/timers/TimerNotificationService.java b/app/src/main/java/com/philliphsu/clock2/timers/TimerNotificationService.java
index a148fdd..5ff05f6 100644
--- a/app/src/main/java/com/philliphsu/clock2/timers/TimerNotificationService.java
+++ b/app/src/main/java/com/philliphsu/clock2/timers/TimerNotificationService.java
@@ -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.
diff --git a/app/src/main/java/com/philliphsu/clock2/timers/data/AsyncTimersTableUpdateHandler.java b/app/src/main/java/com/philliphsu/clock2/timers/data/AsyncTimersTableUpdateHandler.java
index 2f0238d..0714f39 100644
--- a/app/src/main/java/com/philliphsu/clock2/timers/data/AsyncTimersTableUpdateHandler.java
+++ b/app/src/main/java/com/philliphsu/clock2/timers/data/AsyncTimersTableUpdateHandler.java
@@ -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.
diff --git a/app/src/main/java/com/philliphsu/clock2/timers/TimerViewHolder.java b/app/src/main/java/com/philliphsu/clock2/timers/ui/TimerViewHolder.java
similarity index 97%
rename from app/src/main/java/com/philliphsu/clock2/timers/TimerViewHolder.java
rename to app/src/main/java/com/philliphsu/clock2/timers/ui/TimerViewHolder.java
index 54bea7c..b2d3208 100644
--- a/app/src/main/java/com/philliphsu/clock2/timers/TimerViewHolder.java
+++ b/app/src/main/java/com/philliphsu/clock2/timers/ui/TimerViewHolder.java
@@ -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;
diff --git a/app/src/main/java/com/philliphsu/clock2/timers/TimersCursorAdapter.java b/app/src/main/java/com/philliphsu/clock2/timers/ui/TimersCursorAdapter.java
similarity index 96%
rename from app/src/main/java/com/philliphsu/clock2/timers/TimersCursorAdapter.java
rename to app/src/main/java/com/philliphsu/clock2/timers/ui/TimersCursorAdapter.java
index 83b9d48..8763259 100644
--- a/app/src/main/java/com/philliphsu/clock2/timers/TimersCursorAdapter.java
+++ b/app/src/main/java/com/philliphsu/clock2/timers/ui/TimersCursorAdapter.java
@@ -1,4 +1,4 @@
-package com.philliphsu.clock2.timers;
+package com.philliphsu.clock2.timers.ui;
 
 import android.view.ViewGroup;
 
diff --git a/app/src/main/java/com/philliphsu/clock2/timers/TimersFragment.java b/app/src/main/java/com/philliphsu/clock2/timers/ui/TimersFragment.java
similarity index 99%
rename from app/src/main/java/com/philliphsu/clock2/timers/TimersFragment.java
rename to app/src/main/java/com/philliphsu/clock2/timers/ui/TimersFragment.java
index c9b04e1..fcd96ff 100644
--- a/app/src/main/java/com/philliphsu/clock2/timers/TimersFragment.java
+++ b/app/src/main/java/com/philliphsu/clock2/timers/ui/TimersFragment.java
@@ -1,4 +1,4 @@
-package com.philliphsu.clock2.timers;
+package com.philliphsu.clock2.timers.ui;
 
 
 import android.app.Activity;