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

Starting to write BaseVH and BaseAdapter

Browse Source
This commit is contained in:
Phillip Hsu 2016-05-31 02:01:01 -07:00
parent 2ad3cca872
commit 402255b4a0
4 changed files with 213 additions and 123 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
app/src/main/java/com/philliphsu/clock2/BaseAdapter.java Normal file
View File

@ -0,0 +1,25 @@
package com.philliphsu.clock2;
import android.support.v7.widget.RecyclerView;
import android.view.ViewGroup;
/**
* Created by Phillip Hsu on 5/31/2016.
*/
public abstract class BaseAdapter<T> extends RecyclerView.Adapter<BaseViewHolder<T>> {
@Override
public BaseViewHolder<T> onCreateViewHolder(ViewGroup parent, int viewType) {
return null;
}
@Override
public void onBindViewHolder(BaseViewHolder<T> holder, int position) {
}
@Override
public int getItemCount() {
return 0;
}
}

40
app/src/main/java/com/philliphsu/clock2/BaseViewHolder.java Normal file
View File

@ -0,0 +1,40 @@
package com.philliphsu.clock2;
import android.support.annotation.CallSuper;
import android.support.annotation.LayoutRes;
import android.support.v7.widget.RecyclerView;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import butterknife.ButterKnife;
/**
* Created by Phillip Hsu on 5/31/2016.
*/
public abstract class BaseViewHolder<T> extends RecyclerView.ViewHolder implements View.OnClickListener {
private final OnClickListener<T> mOnClickListener;
private T mItem;
public BaseViewHolder(ViewGroup parent, @LayoutRes int layoutRes, OnClickListener<T> listener) {
super(LayoutInflater.from(parent.getContext())
.inflate(layoutRes, parent, false));
ButterKnife.bind(this, itemView);
mOnClickListener = listener;
}
@CallSuper
public void onBind(T item) {
mItem = item;
}
@Override
public final void onClick(View v) {
mOnClickListener.onClick(mItem);
}
public interface OnClickListener<T> {
void onClick(T item);
}
}

141
app/src/main/java/com/philliphsu/clock2/alarms/AlarmViewHolder.java Normal file
View File

@ -0,0 +1,141 @@
package com.philliphsu.clock2.alarms;
import android.content.Context;
import android.content.SharedPreferences;
import android.preference.PreferenceManager;
import android.support.annotation.CallSuper;
import android.support.v7.widget.RecyclerView;
import android.support.v7.widget.SwitchCompat;
import android.text.SpannableString;
import android.text.Spanned;
import android.text.format.DateFormat;
import android.text.style.RelativeSizeSpan;
import android.view.View;
import android.widget.Button;
import android.widget.TextView;
import com.philliphsu.clock2.Alarm;
import com.philliphsu.clock2.DaysOfWeek;
import com.philliphsu.clock2.R;
import java.util.Date;
import butterknife.Bind;
import butterknife.ButterKnife;
import static android.view.View.GONE;
import static android.view.View.VISIBLE;
import static com.philliphsu.clock2.DaysOfWeek.NUM_DAYS;
/**
* Created by Phillip Hsu on 5/31/2016.
*/
public class AlarmViewHolder extends RecyclerView.ViewHolder implements View.OnClickListener {
private static final RelativeSizeSpan AMPM_SIZE_SPAN = new RelativeSizeSpan(0.5f);
private final Context mContext;
private final AlarmsFragment.OnListFragmentInteractionListener mListener;
private Alarm mItem;
@Bind(R.id.time) TextView mTime;
@Bind(R.id.on_off_switch) SwitchCompat mSwitch;
@Bind(R.id.label) TextView mLabel;
@Bind(R.id.countdown) TextView mCountdown; // TODO: Change type to NextAlarmText, once you move that class to this project
@Bind(R.id.recurring_days) TextView mDays;
@Bind(R.id.dismiss) Button mDismissButton;
/*public AlarmViewHolder(ViewGroup parent, BaseViewHolder.OnClickListener<Alarm> listener) {
}*/
public AlarmViewHolder(View view, AlarmsFragment.OnListFragmentInteractionListener listener) {
super(view);
ButterKnife.bind(this, view);
mContext = view.getContext();
mListener = listener;
view.setOnClickListener(this);
}
/**
* Call to super must be the first line in the overridden implementation,
* so that the base class can keep a reference to the item parameter.
*/
@CallSuper
public void onBind(Alarm alarm) {
mItem = alarm;
String time = DateFormat.getTimeFormat(mContext).format(new Date(alarm.ringsAt()));
if (DateFormat.is24HourFormat(mContext)) {
mTime.setText(time);
} else {
// No way around having to construct this on binding
SpannableString s = new SpannableString(time);
s.setSpan(AMPM_SIZE_SPAN, time.indexOf(" "), time.length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
mTime.setText(s, TextView.BufferType.SPANNABLE);
}
if (alarm.isEnabled()) {
mSwitch.setChecked(true);
//TODO:mCountdown.showAsText(alarm.ringsIn());
mCountdown.setVisibility(VISIBLE);
//todo:mCountdown.getTickHandler().startTicking(true)
SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(mContext);
// how many hours before alarm is considered upcoming
// TODO: shared prefs
/*int hoursBeforeUpcoming = Integer.parseInt(prefs.getString(
mContext.getString(-1TODO:R.string.key_notify_me_of_upcoming_alarms),
"2"));*/
if (alarm.ringsWithinHours(2) || alarm.isSnoozed()) {
// TODO: Register dynamic broadcast receiver in this class to listen for
// when this alarm crosses the upcoming threshold, so we can show this button.
mDismissButton.setVisibility(VISIBLE);
} else {
mDismissButton.setVisibility(GONE);
}
} else {
mSwitch.setChecked(false);
mCountdown.setVisibility(GONE);
//TODO:mCountdown.getTickHandler().stopTicking();
mDismissButton.setVisibility(GONE);
}
mLabel.setText(alarm.label());
if (mLabel.length() == 0 && mCountdown.getVisibility() != VISIBLE) {
mLabel.setVisibility(GONE);
} else {
// needed for proper positioning of mCountdown
mLabel.setVisibility(VISIBLE);
}
int numRecurringDays = alarm.numRecurringDays();
if (numRecurringDays > 0) {
String text;
if (numRecurringDays == NUM_DAYS) {
text = mContext.getString(R.string.every_day);
} else {
StringBuilder sb = new StringBuilder();
for (int i = 0; // ordinal number, i.e. the position in the week, not an actual day!
i < NUM_DAYS; i++) {
if (alarm.isRecurring(i)) { // Is the i-th day in the week recurring?
// This is the actual day at the i-th position in the week.
int weekDay = DaysOfWeek.getInstance(mContext).weekDay(i);
sb.append(DaysOfWeek.getLabel(weekDay)).append(", ");
}
}
// Cut off the last comma and space
sb.delete(sb.length() - 2, sb.length());
text = sb.toString();
}
mDays.setText(text);
mDays.setVisibility(VISIBLE);
} else {
mDays.setVisibility(GONE);
}
}
@Override
public void onClick(View v) {
if (mListener != null) {
mListener.onListFragmentInteraction(mItem);
}
}
}

130
app/src/main/java/com/philliphsu/clock2/alarms/AlarmsAdapter.java
View File

@ -1,43 +1,23 @@
package com.philliphsu.clock2.alarms;
import android.content.Context;
import android.content.SharedPreferences;
import android.preference.PreferenceManager;
import android.support.v7.util.SortedList;
import android.support.v7.widget.RecyclerView;
import android.support.v7.widget.SwitchCompat;
import android.support.v7.widget.util.SortedListAdapterCallback;
import android.text.SpannableString;
import android.text.Spanned;
import android.text.format.DateFormat;
import android.text.style.RelativeSizeSpan;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.widget.Button;
import android.widget.TextView;
import com.philliphsu.clock2.Alarm;
import com.philliphsu.clock2.DaysOfWeek;
import com.philliphsu.clock2.R;
import java.util.Arrays;
import java.util.Date;
import java.util.List;
import butterknife.Bind;
import butterknife.ButterKnife;
import static android.view.View.GONE;
import static android.view.View.VISIBLE;
import static com.philliphsu.clock2.DaysOfWeek.NUM_DAYS;
/**
* {@link RecyclerView.Adapter} that can display a {@link Alarm} and makes a call to the
* specified {@link AlarmsFragment.OnListFragmentInteractionListener}.
*/
public class AlarmsAdapter extends RecyclerView.Adapter<AlarmsAdapter.ViewHolder> {
private static final RelativeSizeSpan AMPM_SIZE_SPAN = new RelativeSizeSpan(0.5f);
public class AlarmsAdapter extends RecyclerView.Adapter<AlarmViewHolder> {
private final SortedList<Alarm> mItems;
private final AlarmsFragment.OnListFragmentInteractionListener mListener;
@ -70,118 +50,22 @@ public class AlarmsAdapter extends RecyclerView.Adapter<AlarmsAdapter.ViewHolder
}
@Override
public ViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
public AlarmViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
// TODO: Move this to the BaseAdapter.
View view = LayoutInflater.from(parent.getContext())
.inflate(R.layout.item_alarm, parent, false);
return new ViewHolder(view, mListener);
return new AlarmViewHolder(view, mListener);
}
@Override
public void onBindViewHolder(final ViewHolder holder, int position) {
public void onBindViewHolder(final AlarmViewHolder holder, int position) {
// TODO: Move this to the BaseAdapter.
holder.onBind(mItems.get(position));
}
@Override
public int getItemCount() {
// TODO: Move this to the BaseAdapter.
return mItems.size();
}
static class ViewHolder extends RecyclerView.ViewHolder implements View.OnClickListener {
private final Context mContext;
private final AlarmsFragment.OnListFragmentInteractionListener mListener;
private Alarm mItem;
@Bind(R.id.time) TextView mTime;
@Bind(R.id.on_off_switch) SwitchCompat mSwitch;
@Bind(R.id.label) TextView mLabel;
@Bind(R.id.countdown) TextView mCountdown; // TODO: Change type to NextAlarmText, once you move that class to this project
@Bind(R.id.recurring_days) TextView mDays;
@Bind(R.id.dismiss) Button mDismissButton;
public ViewHolder(View view, AlarmsFragment.OnListFragmentInteractionListener listener) {
super(view);
ButterKnife.bind(this, view);
mContext = view.getContext();
mListener = listener;
view.setOnClickListener(this);
}
public void onBind(Alarm alarm) {
mItem = alarm;
String time = DateFormat.getTimeFormat(mContext).format(new Date(alarm.ringsAt()));
if (DateFormat.is24HourFormat(mContext)) {
mTime.setText(time);
} else {
// No way around having to construct this on binding
SpannableString s = new SpannableString(time);
s.setSpan(AMPM_SIZE_SPAN, time.indexOf(" "), time.length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
mTime.setText(s, TextView.BufferType.SPANNABLE);
}
if (alarm.isEnabled()) {
mSwitch.setChecked(true);
//TODO:mCountdown.showAsText(alarm.ringsIn());
mCountdown.setVisibility(VISIBLE);
//todo:mCountdown.getTickHandler().startTicking(true)
SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(mContext);
// how many hours before alarm is considered upcoming
// TODO: shared prefs
/*int hoursBeforeUpcoming = Integer.parseInt(prefs.getString(
mContext.getString(-1TODO:R.string.key_notify_me_of_upcoming_alarms),
"2"));*/
if (alarm.ringsWithinHours(2) || alarm.isSnoozed()) {
// TODO: Register dynamic broadcast receiver in this class to listen for
// when this alarm crosses the upcoming threshold, so we can show this button.
mDismissButton.setVisibility(VISIBLE);
} else {
mDismissButton.setVisibility(GONE);
}
} else {
mSwitch.setChecked(false);
mCountdown.setVisibility(GONE);
//TODO:mCountdown.getTickHandler().stopTicking();
mDismissButton.setVisibility(GONE);
}
mLabel.setText(alarm.label());
if (mLabel.length() == 0 && mCountdown.getVisibility() != VISIBLE) {
mLabel.setVisibility(GONE);
} else {
// needed for proper positioning of mCountdown
mLabel.setVisibility(VISIBLE);
}
int numRecurringDays = alarm.numRecurringDays();
if (numRecurringDays > 0) {
String text;
if (numRecurringDays == NUM_DAYS) {
text = mContext.getString(R.string.every_day);
} else {
StringBuilder sb = new StringBuilder();
for (int i = 0; // ordinal number, i.e. the position in the week, not an actual day!
i < NUM_DAYS; i++) {
if (alarm.isRecurring(i)) { // Is the i-th day in the week recurring?
// This is the actual day at the i-th position in the week.
int weekDay = DaysOfWeek.getInstance(mContext).weekDay(i);
sb.append(DaysOfWeek.getLabel(weekDay)).append(", ");
}
}
// Cut off the last comma and space
sb.delete(sb.length() - 2, sb.length());
text = sb.toString();
}
mDays.setText(text);
mDays.setVisibility(VISIBLE);
} else {
mDays.setVisibility(GONE);
}
}
@Override
public void onClick(View v) {
if (mListener != null) {
mListener.onListFragmentInteraction(mItem);
}
}
}
}