Create new dialogs package and rename editalarm package to timepickers

app/src/main/java/com/philliphsu/clock2/TimePickerDialogController.java

@@ -6,9 +6,10 @@ import android.support.v4.app.FragmentManager;
 import android.text.format.DateFormat;
 import android.util.Log;
 
-import com.philliphsu.clock2.editalarm.BaseTimePickerDialog;
+import com.philliphsu.clock2.dialogs.DialogFragmentController;
-import com.philliphsu.clock2.editalarm.NumberGridTimePickerDialog;
+import com.philliphsu.clock2.timepickers.BaseTimePickerDialog;
-import com.philliphsu.clock2.editalarm.NumpadTimePickerDialog;
+import com.philliphsu.clock2.timepickers.NumberGridTimePickerDialog;
+import com.philliphsu.clock2.timepickers.NumpadTimePickerDialog;
 
 /**
  * Created by Phillip Hsu on 9/6/2016.

app/src/main/java/com/philliphsu/clock2/alarms/AlarmsFragment.java

@@ -19,7 +19,7 @@ import com.philliphsu.clock2.AsyncAlarmsTableUpdateHandler;
 import com.philliphsu.clock2.R;
 import com.philliphsu.clock2.RecyclerViewFragment;
 import com.philliphsu.clock2.TimePickerDialogController;
-import com.philliphsu.clock2.editalarm.BaseTimePickerDialog;
+import com.philliphsu.clock2.timepickers.BaseTimePickerDialog;
 import com.philliphsu.clock2.model.AlarmCursor;
 import com.philliphsu.clock2.model.AlarmsListCursorLoader;
 import com.philliphsu.clock2.util.AlarmController;

app/src/main/java/com/philliphsu/clock2/alarms/BaseAlarmViewHolder.java

@@ -16,15 +16,15 @@ import android.view.ViewGroup;
 import android.widget.Button;
 import android.widget.TextView;
 
-import com.philliphsu.clock2.AddLabelDialog;
+import com.philliphsu.clock2.dialogs.AddLabelDialog;
-import com.philliphsu.clock2.AddLabelDialogController;
+import com.philliphsu.clock2.dialogs.AddLabelDialogController;
 import com.philliphsu.clock2.Alarm;
 import com.philliphsu.clock2.BaseViewHolder;
 import com.philliphsu.clock2.OnListItemInteractionListener;
 import com.philliphsu.clock2.R;
 import com.philliphsu.clock2.TimePickerDialogController;
 import com.philliphsu.clock2.aospdatetimepicker.Utils;
-import com.philliphsu.clock2.editalarm.BaseTimePickerDialog.OnTimeSetListener;
+import com.philliphsu.clock2.timepickers.BaseTimePickerDialog.OnTimeSetListener;
 import com.philliphsu.clock2.util.TimeTextUtils;
 import com.philliphsu.clock2.util.AlarmController;
 import com.philliphsu.clock2.util.AlarmUtils;

app/src/main/java/com/philliphsu/clock2/alarms/ExpandedAlarmViewHolder.java

@@ -17,9 +17,9 @@ import com.philliphsu.clock2.Alarm;
 import com.philliphsu.clock2.DaysOfWeek;
 import com.philliphsu.clock2.OnListItemInteractionListener;
 import com.philliphsu.clock2.R;
-import com.philliphsu.clock2.RingtonePickerDialog;
+import com.philliphsu.clock2.dialogs.RingtonePickerDialog;
 import com.philliphsu.clock2.aospdatetimepicker.Utils;
-import com.philliphsu.clock2.settings.RingtonePickerDialogController;
+import com.philliphsu.clock2.dialogs.RingtonePickerDialogController;
 import com.philliphsu.clock2.util.AlarmController;
 import com.philliphsu.clock2.util.FragmentTagUtils;
 

app/src/main/java/com/philliphsu/clock2/dialogs/AddLabelDialog.java

@@ -1,4 +1,4 @@
-package com.philliphsu.clock2;
+package com.philliphsu.clock2.dialogs;
 
 import android.content.DialogInterface;
 import android.support.v7.app.AlertDialog;
@@ -6,6 +6,8 @@ import android.support.v7.widget.AppCompatEditText;
 import android.view.inputmethod.EditorInfo;
 import android.widget.EditText;
 
+import com.philliphsu.clock2.R;
+
 import static com.philliphsu.clock2.util.KeyboardUtils.showKeyboard;
 
 /**

app/src/main/java/com/philliphsu/clock2/dialogs/AddLabelDialogController.java

@@ -1,4 +1,4 @@
-package com.philliphsu.clock2;
+package com.philliphsu.clock2.dialogs;
 
 import android.support.v4.app.FragmentManager;
 import android.util.Log;

app/src/main/java/com/philliphsu/clock2/dialogs/BaseAlertDialogFragment.java

@@ -1,4 +1,4 @@
-package com.philliphsu.clock2;
+package com.philliphsu.clock2.dialogs;
 
 import android.app.Dialog;
 import android.content.DialogInterface;

app/src/main/java/com/philliphsu/clock2/dialogs/DialogFragmentController.java

@@ -1,4 +1,4 @@
-package com.philliphsu.clock2;
+package com.philliphsu.clock2.dialogs;
 
 import android.support.annotation.Nullable;
 import android.support.v4.app.DialogFragment;

app/src/main/java/com/philliphsu/clock2/dialogs/RingtonePickerDialog.java

@@ -1,4 +1,4 @@
-package com.philliphsu.clock2;
+package com.philliphsu.clock2.dialogs;
 
 import android.content.DialogInterface;
 import android.database.Cursor;
@@ -8,6 +8,7 @@ import android.os.Bundle;
 import android.support.annotation.Nullable;
 import android.support.v7.app.AlertDialog;
 
+import com.philliphsu.clock2.R;
 import com.philliphsu.clock2.ringtone.RingtoneLoop;
 
 /**

app/src/main/java/com/philliphsu/clock2/dialogs/RingtonePickerDialogController.java

@@ -1,11 +1,11 @@
-package com.philliphsu.clock2.settings;
+package com.philliphsu.clock2.dialogs;
 
 import android.net.Uri;
 import android.support.v4.app.FragmentManager;
 import android.util.Log;
 
-import com.philliphsu.clock2.DialogFragmentController;
+import com.philliphsu.clock2.dialogs.DialogFragmentController;
-import com.philliphsu.clock2.RingtonePickerDialog;
+import com.philliphsu.clock2.dialogs.RingtonePickerDialog;
 
 /**
  * Created by Phillip Hsu on 9/20/2016.

app/src/main/java/com/philliphsu/clock2/edittimer/EditTimerActivity.java

@@ -12,8 +12,8 @@ import android.view.ViewGroup;
 import android.widget.EditText;
 import android.widget.TextView;
 
-import com.philliphsu.clock2.AddLabelDialog;
+import com.philliphsu.clock2.dialogs.AddLabelDialog;
-import com.philliphsu.clock2.AddLabelDialogController;
+import com.philliphsu.clock2.dialogs.AddLabelDialogController;
 import com.philliphsu.clock2.BaseActivity;
 import com.philliphsu.clock2.R;
 import com.philliphsu.clock2.util.FragmentTagUtils;

app/src/main/java/com/philliphsu/clock2/settings/ThemedRingtonePreference.java

@@ -11,7 +11,8 @@ import android.provider.Settings;
 import android.support.v7.app.AppCompatActivity;
 import android.util.AttributeSet;
 
-import com.philliphsu.clock2.RingtonePickerDialog;
+import com.philliphsu.clock2.dialogs.RingtonePickerDialog;
+import com.philliphsu.clock2.dialogs.RingtonePickerDialogController;
 
 /**
  * Created by Phillip Hsu on 9/20/2016.

app/src/main/java/com/philliphsu/clock2/timepickers/BaseTimePickerDialog.java

@@ -1,4 +1,4 @@
-package com.philliphsu.clock2.editalarm;
+package com.philliphsu.clock2.timepickers;
 
 import android.os.Bundle;
 import android.support.annotation.LayoutRes;

app/src/main/java/com/philliphsu/clock2/timepickers/GridLayoutNumpad.java

@@ -1,4 +1,4 @@
-package com.philliphsu.clock2.editalarm;
+package com.philliphsu.clock2.timepickers;
 
 import android.content.Context;
 import android.content.res.ColorStateList;

app/src/main/java/com/philliphsu/clock2/timepickers/GridSelectorLayout.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.philliphsu.clock2.editalarm;
+package com.philliphsu.clock2.timepickers;
 
 import android.content.Context;
 import android.os.Handler;

app/src/main/java/com/philliphsu/clock2/timepickers/HoursGrid.java

@@ -1,4 +1,4 @@
-package com.philliphsu.clock2.editalarm;
+package com.philliphsu.clock2.timepickers;
 
 import android.content.Context;
 

app/src/main/java/com/philliphsu/clock2/timepickers/MinutesGrid.java

@@ -1,4 +1,4 @@
-package com.philliphsu.clock2.editalarm;
+package com.philliphsu.clock2.timepickers;
 
 import android.content.Context;
 import android.support.v4.content.ContextCompat;

app/src/main/java/com/philliphsu/clock2/timepickers/NumberGridTimePickerDialog.java

@@ -14,7 +14,7 @@
  * limitations under the License
  */
 
-package com.philliphsu.clock2.editalarm;
+package com.philliphsu.clock2.timepickers;
 
 import android.animation.ObjectAnimator;
 import android.app.ActionBar.LayoutParams;
@@ -37,7 +37,7 @@ import android.widget.TextView;
 
 import com.philliphsu.clock2.R;
 import com.philliphsu.clock2.aospdatetimepicker.Utils;
-import com.philliphsu.clock2.editalarm.GridSelectorLayout.OnValueSelectedListener;
+import com.philliphsu.clock2.timepickers.GridSelectorLayout.OnValueSelectedListener;
 
 import java.text.DateFormatSymbols;
 import java.util.ArrayList;

app/src/main/java/com/philliphsu/clock2/timepickers/NumbersGrid.java

@@ -1,4 +1,4 @@
-package com.philliphsu.clock2.editalarm;
+package com.philliphsu.clock2.timepickers;
 
 import android.content.Context;
 import android.support.annotation.LayoutRes;

app/src/main/java/com/philliphsu/clock2/timepickers/NumpadTimePicker.java

@@ -1,4 +1,4 @@
-package com.philliphsu.clock2.editalarm;
+package com.philliphsu.clock2.timepickers;
 
 import android.animation.ObjectAnimator;
 import android.content.Context;

app/src/main/java/com/philliphsu/clock2/timepickers/NumpadTimePickerDialog.java

@@ -1,4 +1,4 @@
-package com.philliphsu.clock2.editalarm;
+package com.philliphsu.clock2.timepickers;
 
 import android.os.Bundle;
 import android.support.v4.content.ContextCompat;

app/src/main/java/com/philliphsu/clock2/timepickers/TwentyFourHourGridItem.java

@@ -1,4 +1,4 @@
-package com.philliphsu.clock2.editalarm;
+package com.philliphsu.clock2.timepickers;
 
 import android.content.Context;
 import android.content.res.Configuration;

app/src/main/java/com/philliphsu/clock2/timepickers/TwentyFourHoursGrid.java

@@ -1,4 +1,4 @@
-package com.philliphsu.clock2.editalarm;
+package com.philliphsu.clock2.timepickers;
 
 import android.content.Context;
 import android.support.v4.content.ContextCompat;

app/src/main/java/com/philliphsu/clock2/timers/TimerViewHolder.java

@@ -15,8 +15,8 @@ import android.widget.ImageButton;
 import android.widget.SeekBar;
 import android.widget.TextView;
 
-import com.philliphsu.clock2.AddLabelDialog;
+import com.philliphsu.clock2.dialogs.AddLabelDialog;
-import com.philliphsu.clock2.AddLabelDialogController;
+import com.philliphsu.clock2.dialogs.AddLabelDialogController;
 import com.philliphsu.clock2.AsyncTimersTableUpdateHandler;
 import com.philliphsu.clock2.BaseViewHolder;
 import com.philliphsu.clock2.OnListItemInteractionListener;

app/src/main/res/layout-land/dialog_time_picker_number_grid.xml

@@ -22,7 +22,7 @@
                 android:layout_gravity="center" />
         </FrameLayout>
 
-        <com.philliphsu.clock2.editalarm.GridSelectorLayout
+        <com.philliphsu.clock2.timepickers.GridSelectorLayout
             android:id="@+id/time_picker"
             android:layout_width="0dp"
             android:layout_height="match_parent"

app/src/main/res/layout-land/dialog_time_picker_numpad.xml

@@ -20,7 +20,7 @@ doesn't work. -->
     <!--<View style="@style/FocusGrabber"
           android:id="@+id/focus_grabber"/>-->
 
-    <com.philliphsu.clock2.editalarm.NumpadTimePicker
+    <com.philliphsu.clock2.timepickers.NumpadTimePicker
         android:id="@+id/number_grid"
         android:layout_width="0dp"
         android:layout_height="match_parent"

app/src/main/res/layout/content_24h_number_grid.xml

@@ -2,51 +2,51 @@
 <merge xmlns:app="http://schemas.android.com/apk/res-auto">
     <!-- Although the style defines a textSize attribute, it will not be
     applied because this is just a LinearLayout. -->
-    <com.philliphsu.clock2.editalarm.TwentyFourHourGridItem
+    <com.philliphsu.clock2.timepickers.TwentyFourHourGridItem
         style="@style/NumberGridButton.Hour"
         app:primaryText="00"
         app:secondaryText="12"/>
-    <com.philliphsu.clock2.editalarm.TwentyFourHourGridItem
+    <com.philliphsu.clock2.timepickers.TwentyFourHourGridItem
         style="@style/NumberGridButton.Hour"
         app:primaryText="01"
         app:secondaryText="13"/>
-    <com.philliphsu.clock2.editalarm.TwentyFourHourGridItem
+    <com.philliphsu.clock2.timepickers.TwentyFourHourGridItem
         style="@style/NumberGridButton.Hour"
         app:primaryText="02"
         app:secondaryText="14"/>
-    <com.philliphsu.clock2.editalarm.TwentyFourHourGridItem
+    <com.philliphsu.clock2.timepickers.TwentyFourHourGridItem
         style="@style/NumberGridButton.Hour"
         app:primaryText="03"
         app:secondaryText="15"/>
-    <com.philliphsu.clock2.editalarm.TwentyFourHourGridItem
+    <com.philliphsu.clock2.timepickers.TwentyFourHourGridItem
         style="@style/NumberGridButton.Hour"
         app:primaryText="04"
         app:secondaryText="16"/>
-    <com.philliphsu.clock2.editalarm.TwentyFourHourGridItem
+    <com.philliphsu.clock2.timepickers.TwentyFourHourGridItem
         style="@style/NumberGridButton.Hour"
         app:primaryText="05"
         app:secondaryText="17"/>
-    <com.philliphsu.clock2.editalarm.TwentyFourHourGridItem
+    <com.philliphsu.clock2.timepickers.TwentyFourHourGridItem
         style="@style/NumberGridButton.Hour"
         app:primaryText="06"
         app:secondaryText="18"/>
-    <com.philliphsu.clock2.editalarm.TwentyFourHourGridItem
+    <com.philliphsu.clock2.timepickers.TwentyFourHourGridItem
         style="@style/NumberGridButton.Hour"
         app:primaryText="07"
         app:secondaryText="19"/>
-    <com.philliphsu.clock2.editalarm.TwentyFourHourGridItem
+    <com.philliphsu.clock2.timepickers.TwentyFourHourGridItem
         style="@style/NumberGridButton.Hour"
         app:primaryText="08"
         app:secondaryText="20"/>
-    <com.philliphsu.clock2.editalarm.TwentyFourHourGridItem
+    <com.philliphsu.clock2.timepickers.TwentyFourHourGridItem
         style="@style/NumberGridButton.Hour"
         app:primaryText="09"
         app:secondaryText="21"/>
-    <com.philliphsu.clock2.editalarm.TwentyFourHourGridItem
+    <com.philliphsu.clock2.timepickers.TwentyFourHourGridItem
         style="@style/NumberGridButton.Hour"
         app:primaryText="10"
         app:secondaryText="22"/>
-    <com.philliphsu.clock2.editalarm.TwentyFourHourGridItem
+    <com.philliphsu.clock2.timepickers.TwentyFourHourGridItem
         style="@style/NumberGridButton.Hour"
         app:primaryText="11"
         app:secondaryText="23"/>

app/src/main/res/layout/dialog_time_picker_number_grid.xml

@@ -27,7 +27,7 @@
         <!--TOneverDO: Change paddingBottom to marginBottom without also subtracting the
          margin amount from the height. -->
         <!--TODO: As a library, we probably also want to paddingLeft/Right-->
-        <com.philliphsu.clock2.editalarm.GridSelectorLayout
+        <com.philliphsu.clock2.timepickers.GridSelectorLayout
             android:id="@+id/time_picker"
             android:layout_width="match_parent"
             android:layout_height="@dimen/number_grid_height"

app/src/main/res/layout/dialog_time_picker_numpad.xml

@@ -20,7 +20,7 @@ doesn't work. -->
     <!--<View style="@style/FocusGrabber"
           android:id="@+id/focus_grabber"/>-->
 
-    <com.philliphsu.clock2.editalarm.NumpadTimePicker
+    <com.philliphsu.clock2.timepickers.NumpadTimePicker
         android:id="@+id/number_grid"
         android:layout_width="match_parent"
         android:layout_height="@dimen/numeric_keypad_height"