From ecc4405726dfc01fc7066ebc9e095906da73af46 Mon Sep 17 00:00:00 2001 From: Phillip Hsu Date: Wed, 21 Sep 2016 17:18:45 -0700 Subject: [PATCH] Create list package to hold base RecyclerView components --- .../philliphsu/clock2/AsyncDatabaseTableUpdateHandler.java | 2 +- .../com/philliphsu/clock2/AsyncTimersTableUpdateHandler.java | 2 +- app/src/main/java/com/philliphsu/clock2/MainActivity.java | 1 + .../clock2/alarms/data/AsyncAlarmsTableUpdateHandler.java | 2 +- .../com/philliphsu/clock2/alarms/ui/AlarmsCursorAdapter.java | 4 ++-- .../java/com/philliphsu/clock2/alarms/ui/AlarmsFragment.java | 2 +- .../com/philliphsu/clock2/alarms/ui/BaseAlarmViewHolder.java | 4 ++-- .../clock2/alarms/ui/CollapsedAlarmViewHolder.java | 2 +- .../philliphsu/clock2/alarms/ui/ExpandedAlarmViewHolder.java | 2 +- .../com/philliphsu/clock2/{ => list}/BaseCursorAdapter.java | 2 +- .../com/philliphsu/clock2/{ => list}/BaseViewHolder.java | 2 +- .../clock2/{ => list}/OnListItemInteractionListener.java | 2 +- .../philliphsu/clock2/{ => list}/RecyclerViewFragment.java | 5 +++-- .../philliphsu/clock2/{alarms => list}/ScrollHandler.java | 2 +- .../clock2/stopwatch/AsyncLapsTableUpdateHandler.java | 2 +- .../java/com/philliphsu/clock2/stopwatch/LapViewHolder.java | 2 +- .../java/com/philliphsu/clock2/stopwatch/LapsAdapter.java | 4 ++-- .../com/philliphsu/clock2/stopwatch/StopwatchFragment.java | 2 +- .../java/com/philliphsu/clock2/timers/TimerViewHolder.java | 4 ++-- .../com/philliphsu/clock2/timers/TimersCursorAdapter.java | 4 ++-- .../java/com/philliphsu/clock2/timers/TimersFragment.java | 2 +- 21 files changed, 28 insertions(+), 26 deletions(-) rename app/src/main/java/com/philliphsu/clock2/{ => list}/BaseCursorAdapter.java (98%) rename app/src/main/java/com/philliphsu/clock2/{ => list}/BaseViewHolder.java (97%) rename app/src/main/java/com/philliphsu/clock2/{ => list}/OnListItemInteractionListener.java (86%) rename app/src/main/java/com/philliphsu/clock2/{ => list}/RecyclerViewFragment.java (98%) rename app/src/main/java/com/philliphsu/clock2/{alarms => list}/ScrollHandler.java (91%) diff --git a/app/src/main/java/com/philliphsu/clock2/AsyncDatabaseTableUpdateHandler.java b/app/src/main/java/com/philliphsu/clock2/AsyncDatabaseTableUpdateHandler.java index 56e9cf3..dcbd243 100644 --- a/app/src/main/java/com/philliphsu/clock2/AsyncDatabaseTableUpdateHandler.java +++ b/app/src/main/java/com/philliphsu/clock2/AsyncDatabaseTableUpdateHandler.java @@ -3,7 +3,7 @@ package com.philliphsu.clock2; import android.content.Context; import android.os.AsyncTask; -import com.philliphsu.clock2.alarms.ScrollHandler; +import com.philliphsu.clock2.list.ScrollHandler; import com.philliphsu.clock2.model.DatabaseTableManager; import com.philliphsu.clock2.model.ObjectWithId; diff --git a/app/src/main/java/com/philliphsu/clock2/AsyncTimersTableUpdateHandler.java b/app/src/main/java/com/philliphsu/clock2/AsyncTimersTableUpdateHandler.java index c7a0077..87f2fd9 100644 --- a/app/src/main/java/com/philliphsu/clock2/AsyncTimersTableUpdateHandler.java +++ b/app/src/main/java/com/philliphsu/clock2/AsyncTimersTableUpdateHandler.java @@ -6,7 +6,7 @@ import android.content.Context; import android.content.Intent; import android.util.Log; -import com.philliphsu.clock2.alarms.ScrollHandler; +import com.philliphsu.clock2.list.ScrollHandler; import com.philliphsu.clock2.model.TimersTableManager; import com.philliphsu.clock2.timers.TimerNotificationService; import com.philliphsu.clock2.timers.TimesUpActivity; diff --git a/app/src/main/java/com/philliphsu/clock2/MainActivity.java b/app/src/main/java/com/philliphsu/clock2/MainActivity.java index 71cf20b..d9e44aa 100644 --- a/app/src/main/java/com/philliphsu/clock2/MainActivity.java +++ b/app/src/main/java/com/philliphsu/clock2/MainActivity.java @@ -20,6 +20,7 @@ import android.view.ViewGroup; 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.timers.TimersFragment; diff --git a/app/src/main/java/com/philliphsu/clock2/alarms/data/AsyncAlarmsTableUpdateHandler.java b/app/src/main/java/com/philliphsu/clock2/alarms/data/AsyncAlarmsTableUpdateHandler.java index 68f6461..0c0da25 100644 --- a/app/src/main/java/com/philliphsu/clock2/alarms/data/AsyncAlarmsTableUpdateHandler.java +++ b/app/src/main/java/com/philliphsu/clock2/alarms/data/AsyncAlarmsTableUpdateHandler.java @@ -7,7 +7,7 @@ import android.view.View; import com.philliphsu.clock2.AsyncDatabaseTableUpdateHandler; import com.philliphsu.clock2.R; import com.philliphsu.clock2.alarms.Alarm; -import com.philliphsu.clock2.alarms.ScrollHandler; +import com.philliphsu.clock2.list.ScrollHandler; import com.philliphsu.clock2.alarms.misc.AlarmController; /** diff --git a/app/src/main/java/com/philliphsu/clock2/alarms/ui/AlarmsCursorAdapter.java b/app/src/main/java/com/philliphsu/clock2/alarms/ui/AlarmsCursorAdapter.java index 843a2c2..3ce3254 100644 --- a/app/src/main/java/com/philliphsu/clock2/alarms/ui/AlarmsCursorAdapter.java +++ b/app/src/main/java/com/philliphsu/clock2/alarms/ui/AlarmsCursorAdapter.java @@ -3,8 +3,8 @@ package com.philliphsu.clock2.alarms.ui; import android.support.v7.widget.RecyclerView; import android.view.ViewGroup; -import com.philliphsu.clock2.BaseCursorAdapter; -import com.philliphsu.clock2.OnListItemInteractionListener; +import com.philliphsu.clock2.list.BaseCursorAdapter; +import com.philliphsu.clock2.list.OnListItemInteractionListener; import com.philliphsu.clock2.alarms.Alarm; import com.philliphsu.clock2.alarms.data.AlarmCursor; import com.philliphsu.clock2.alarms.misc.AlarmController; diff --git a/app/src/main/java/com/philliphsu/clock2/alarms/ui/AlarmsFragment.java b/app/src/main/java/com/philliphsu/clock2/alarms/ui/AlarmsFragment.java index aba9049..eac9d30 100644 --- a/app/src/main/java/com/philliphsu/clock2/alarms/ui/AlarmsFragment.java +++ b/app/src/main/java/com/philliphsu/clock2/alarms/ui/AlarmsFragment.java @@ -15,7 +15,7 @@ import android.view.View; import android.view.ViewGroup; import com.philliphsu.clock2.R; -import com.philliphsu.clock2.RecyclerViewFragment; +import com.philliphsu.clock2.list.RecyclerViewFragment; import com.philliphsu.clock2.TimePickerDialogController; import com.philliphsu.clock2.alarms.Alarm; import com.philliphsu.clock2.alarms.data.AlarmsListCursorLoader; diff --git a/app/src/main/java/com/philliphsu/clock2/alarms/ui/BaseAlarmViewHolder.java b/app/src/main/java/com/philliphsu/clock2/alarms/ui/BaseAlarmViewHolder.java index 714cb7b..8c402ec 100644 --- a/app/src/main/java/com/philliphsu/clock2/alarms/ui/BaseAlarmViewHolder.java +++ b/app/src/main/java/com/philliphsu/clock2/alarms/ui/BaseAlarmViewHolder.java @@ -21,8 +21,8 @@ import com.philliphsu.clock2.alarms.misc.AlarmController; import com.philliphsu.clock2.alarms.misc.AlarmPreferences; import com.philliphsu.clock2.dialogs.AddLabelDialog; import com.philliphsu.clock2.dialogs.AddLabelDialogController; -import com.philliphsu.clock2.BaseViewHolder; -import com.philliphsu.clock2.OnListItemInteractionListener; +import com.philliphsu.clock2.list.BaseViewHolder; +import com.philliphsu.clock2.list.OnListItemInteractionListener; import com.philliphsu.clock2.R; import com.philliphsu.clock2.TimePickerDialogController; import com.philliphsu.clock2.aospdatetimepicker.Utils; diff --git a/app/src/main/java/com/philliphsu/clock2/alarms/ui/CollapsedAlarmViewHolder.java b/app/src/main/java/com/philliphsu/clock2/alarms/ui/CollapsedAlarmViewHolder.java index bdf68fc..78fde4f 100644 --- a/app/src/main/java/com/philliphsu/clock2/alarms/ui/CollapsedAlarmViewHolder.java +++ b/app/src/main/java/com/philliphsu/clock2/alarms/ui/CollapsedAlarmViewHolder.java @@ -3,7 +3,7 @@ package com.philliphsu.clock2.alarms.ui; import android.view.ViewGroup; import android.widget.TextView; -import com.philliphsu.clock2.OnListItemInteractionListener; +import com.philliphsu.clock2.list.OnListItemInteractionListener; import com.philliphsu.clock2.R; import com.philliphsu.clock2.alarms.Alarm; import com.philliphsu.clock2.alarms.misc.AlarmController; diff --git a/app/src/main/java/com/philliphsu/clock2/alarms/ui/ExpandedAlarmViewHolder.java b/app/src/main/java/com/philliphsu/clock2/alarms/ui/ExpandedAlarmViewHolder.java index c7db12a..13e379d 100644 --- a/app/src/main/java/com/philliphsu/clock2/alarms/ui/ExpandedAlarmViewHolder.java +++ b/app/src/main/java/com/philliphsu/clock2/alarms/ui/ExpandedAlarmViewHolder.java @@ -13,7 +13,7 @@ import android.widget.Button; import android.widget.CheckBox; import android.widget.ToggleButton; -import com.philliphsu.clock2.OnListItemInteractionListener; +import com.philliphsu.clock2.list.OnListItemInteractionListener; import com.philliphsu.clock2.R; import com.philliphsu.clock2.alarms.Alarm; import com.philliphsu.clock2.alarms.misc.AlarmController; diff --git a/app/src/main/java/com/philliphsu/clock2/BaseCursorAdapter.java b/app/src/main/java/com/philliphsu/clock2/list/BaseCursorAdapter.java similarity index 98% rename from app/src/main/java/com/philliphsu/clock2/BaseCursorAdapter.java rename to app/src/main/java/com/philliphsu/clock2/list/BaseCursorAdapter.java index 72bfc0a..a8f51ef 100644 --- a/app/src/main/java/com/philliphsu/clock2/BaseCursorAdapter.java +++ b/app/src/main/java/com/philliphsu/clock2/list/BaseCursorAdapter.java @@ -1,4 +1,4 @@ -package com.philliphsu.clock2; +package com.philliphsu.clock2.list; import android.support.v7.widget.RecyclerView; import android.util.Log; diff --git a/app/src/main/java/com/philliphsu/clock2/BaseViewHolder.java b/app/src/main/java/com/philliphsu/clock2/list/BaseViewHolder.java similarity index 97% rename from app/src/main/java/com/philliphsu/clock2/BaseViewHolder.java rename to app/src/main/java/com/philliphsu/clock2/list/BaseViewHolder.java index 88861ce..c2fde9d 100644 --- a/app/src/main/java/com/philliphsu/clock2/BaseViewHolder.java +++ b/app/src/main/java/com/philliphsu/clock2/list/BaseViewHolder.java @@ -1,4 +1,4 @@ -package com.philliphsu.clock2; +package com.philliphsu.clock2.list; import android.content.Context; import android.support.annotation.CallSuper; diff --git a/app/src/main/java/com/philliphsu/clock2/OnListItemInteractionListener.java b/app/src/main/java/com/philliphsu/clock2/list/OnListItemInteractionListener.java similarity index 86% rename from app/src/main/java/com/philliphsu/clock2/OnListItemInteractionListener.java rename to app/src/main/java/com/philliphsu/clock2/list/OnListItemInteractionListener.java index 28f0311..a7336d8 100644 --- a/app/src/main/java/com/philliphsu/clock2/OnListItemInteractionListener.java +++ b/app/src/main/java/com/philliphsu/clock2/list/OnListItemInteractionListener.java @@ -1,4 +1,4 @@ -package com.philliphsu.clock2; +package com.philliphsu.clock2.list; /** * Created by Phillip Hsu on 5/31/2016. diff --git a/app/src/main/java/com/philliphsu/clock2/RecyclerViewFragment.java b/app/src/main/java/com/philliphsu/clock2/list/RecyclerViewFragment.java similarity index 98% rename from app/src/main/java/com/philliphsu/clock2/RecyclerViewFragment.java rename to app/src/main/java/com/philliphsu/clock2/list/RecyclerViewFragment.java index 278a80b..ddbc223 100644 --- a/app/src/main/java/com/philliphsu/clock2/RecyclerViewFragment.java +++ b/app/src/main/java/com/philliphsu/clock2/list/RecyclerViewFragment.java @@ -1,4 +1,4 @@ -package com.philliphsu.clock2; +package com.philliphsu.clock2.list; import android.graphics.drawable.Drawable; import android.os.Bundle; @@ -14,7 +14,8 @@ import android.view.View; import android.view.ViewGroup; import android.widget.TextView; -import com.philliphsu.clock2.alarms.ScrollHandler; +import com.philliphsu.clock2.BaseFragment; +import com.philliphsu.clock2.R; import com.philliphsu.clock2.aospdatetimepicker.Utils; import com.philliphsu.clock2.model.BaseItemCursor; import com.philliphsu.clock2.model.ObjectWithId; diff --git a/app/src/main/java/com/philliphsu/clock2/alarms/ScrollHandler.java b/app/src/main/java/com/philliphsu/clock2/list/ScrollHandler.java similarity index 91% rename from app/src/main/java/com/philliphsu/clock2/alarms/ScrollHandler.java rename to app/src/main/java/com/philliphsu/clock2/list/ScrollHandler.java index 6f167f1..043c054 100644 --- a/app/src/main/java/com/philliphsu/clock2/alarms/ScrollHandler.java +++ b/app/src/main/java/com/philliphsu/clock2/list/ScrollHandler.java @@ -1,4 +1,4 @@ -package com.philliphsu.clock2.alarms; +package com.philliphsu.clock2.list; /** * Created by Phillip Hsu on 7/6/2016. diff --git a/app/src/main/java/com/philliphsu/clock2/stopwatch/AsyncLapsTableUpdateHandler.java b/app/src/main/java/com/philliphsu/clock2/stopwatch/AsyncLapsTableUpdateHandler.java index c1ccf27..d64be6f 100644 --- a/app/src/main/java/com/philliphsu/clock2/stopwatch/AsyncLapsTableUpdateHandler.java +++ b/app/src/main/java/com/philliphsu/clock2/stopwatch/AsyncLapsTableUpdateHandler.java @@ -4,7 +4,7 @@ import android.content.Context; import android.content.Intent; import com.philliphsu.clock2.AsyncDatabaseTableUpdateHandler; -import com.philliphsu.clock2.alarms.ScrollHandler; +import com.philliphsu.clock2.list.ScrollHandler; /** * Created by Phillip Hsu on 8/9/2016. diff --git a/app/src/main/java/com/philliphsu/clock2/stopwatch/LapViewHolder.java b/app/src/main/java/com/philliphsu/clock2/stopwatch/LapViewHolder.java index 64fb305..b6542b5 100644 --- a/app/src/main/java/com/philliphsu/clock2/stopwatch/LapViewHolder.java +++ b/app/src/main/java/com/philliphsu/clock2/stopwatch/LapViewHolder.java @@ -4,7 +4,7 @@ import android.view.View; import android.view.ViewGroup; import android.widget.TextView; -import com.philliphsu.clock2.BaseViewHolder; +import com.philliphsu.clock2.list.BaseViewHolder; import com.philliphsu.clock2.R; import butterknife.Bind; diff --git a/app/src/main/java/com/philliphsu/clock2/stopwatch/LapsAdapter.java b/app/src/main/java/com/philliphsu/clock2/stopwatch/LapsAdapter.java index fbab668..1f03558 100644 --- a/app/src/main/java/com/philliphsu/clock2/stopwatch/LapsAdapter.java +++ b/app/src/main/java/com/philliphsu/clock2/stopwatch/LapsAdapter.java @@ -2,8 +2,8 @@ package com.philliphsu.clock2.stopwatch; import android.view.ViewGroup; -import com.philliphsu.clock2.BaseCursorAdapter; -import com.philliphsu.clock2.OnListItemInteractionListener; +import com.philliphsu.clock2.list.BaseCursorAdapter; +import com.philliphsu.clock2.list.OnListItemInteractionListener; /** * Created by Phillip Hsu on 8/9/2016. diff --git a/app/src/main/java/com/philliphsu/clock2/stopwatch/StopwatchFragment.java b/app/src/main/java/com/philliphsu/clock2/stopwatch/StopwatchFragment.java index 45e6b87..06b2c12 100644 --- a/app/src/main/java/com/philliphsu/clock2/stopwatch/StopwatchFragment.java +++ b/app/src/main/java/com/philliphsu/clock2/stopwatch/StopwatchFragment.java @@ -20,7 +20,7 @@ import android.view.ViewGroup; import android.widget.SeekBar; import com.philliphsu.clock2.R; -import com.philliphsu.clock2.RecyclerViewFragment; +import com.philliphsu.clock2.list.RecyclerViewFragment; import com.philliphsu.clock2.util.ProgressBarUtils; import java.lang.ref.WeakReference; diff --git a/app/src/main/java/com/philliphsu/clock2/timers/TimerViewHolder.java b/app/src/main/java/com/philliphsu/clock2/timers/TimerViewHolder.java index 540fe21..9081ec0 100644 --- a/app/src/main/java/com/philliphsu/clock2/timers/TimerViewHolder.java +++ b/app/src/main/java/com/philliphsu/clock2/timers/TimerViewHolder.java @@ -18,8 +18,8 @@ import android.widget.TextView; import com.philliphsu.clock2.dialogs.AddLabelDialog; import com.philliphsu.clock2.dialogs.AddLabelDialogController; import com.philliphsu.clock2.AsyncTimersTableUpdateHandler; -import com.philliphsu.clock2.BaseViewHolder; -import com.philliphsu.clock2.OnListItemInteractionListener; +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.util.FragmentTagUtils; diff --git a/app/src/main/java/com/philliphsu/clock2/timers/TimersCursorAdapter.java b/app/src/main/java/com/philliphsu/clock2/timers/TimersCursorAdapter.java index c86c3d4..7ae2d9e 100644 --- a/app/src/main/java/com/philliphsu/clock2/timers/TimersCursorAdapter.java +++ b/app/src/main/java/com/philliphsu/clock2/timers/TimersCursorAdapter.java @@ -3,8 +3,8 @@ package com.philliphsu.clock2.timers; import android.view.ViewGroup; import com.philliphsu.clock2.AsyncTimersTableUpdateHandler; -import com.philliphsu.clock2.BaseCursorAdapter; -import com.philliphsu.clock2.OnListItemInteractionListener; +import com.philliphsu.clock2.list.BaseCursorAdapter; +import com.philliphsu.clock2.list.OnListItemInteractionListener; import com.philliphsu.clock2.Timer; import com.philliphsu.clock2.model.TimerCursor; diff --git a/app/src/main/java/com/philliphsu/clock2/timers/TimersFragment.java b/app/src/main/java/com/philliphsu/clock2/timers/TimersFragment.java index 1b363e9..d4ef9bb 100644 --- a/app/src/main/java/com/philliphsu/clock2/timers/TimersFragment.java +++ b/app/src/main/java/com/philliphsu/clock2/timers/TimersFragment.java @@ -16,7 +16,7 @@ import android.view.ViewGroup; import com.philliphsu.clock2.AsyncTimersTableUpdateHandler; import com.philliphsu.clock2.R; -import com.philliphsu.clock2.RecyclerViewFragment; +import com.philliphsu.clock2.list.RecyclerViewFragment; import com.philliphsu.clock2.Timer; import com.philliphsu.clock2.edittimer.EditTimerActivity; import com.philliphsu.clock2.model.TimerCursor;