Skip to content

Commit

Permalink
Change ListPickerYearView as RecyclerView
Browse files Browse the repository at this point in the history
  • Loading branch information
@J-Jamet
J-Jamet committed Jan 11, 2017
1 parent 1360511 commit 5ed0655
Show file tree
Hide file tree
Showing 5 changed files with 154 additions and 124 deletions.
2 changes: 1 addition & 1 deletion sample/src/main/java/com/kunzisoft/switchdatetimesample/Sample.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ protected void onCreate(Bundle savedInstanceState) {
dateTimeFragment.set24HoursMode(true);
// WARNING 0 <= MONTH <= 11
dateTimeFragment.setMinimumDateTime(new GregorianCalendar(2015, Calendar.JANUARY, 1).getTime());
dateTimeFragment.setMaximumDateTime(new GregorianCalendar(2030, Calendar.DECEMBER, 31).getTime());
dateTimeFragment.setMaximumDateTime(new GregorianCalendar(2025, Calendar.DECEMBER, 31).getTime());
dateTimeFragment.setDefaultDateTime(new GregorianCalendar(2017, Calendar.MARCH, 4, 15, 20).getTime());
// Or assign each element, default element is the current moment
// dateTimeFragment.setDefaultHourOfDay(15);
Expand Down
1 change: 1 addition & 0 deletions switchdatetime/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ dependencies {
exclude group: 'com.android.support', module: 'support-annotations'
})
compile 'com.android.support:appcompat-v7:25.1.0'
compile 'com.android.support:recyclerview-v7:25.1.0'
compile 'com.prolificinteractive:material-calendarview:1.4.2'
testCompile 'junit:junit:4.12'
}
4 changes: 2 additions & 2 deletions switchdatetime/src/main/java/com/kunzisoft/switchdatetime/SwitchDateTimeDialogFragment.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -289,14 +289,14 @@ public void onYearSelected(View view, int yearPicker) {
year = yearPicker;

dateTimeCalendar.set(Calendar.YEAR, year);
yearHeaderValues.setText(String.valueOf(year));

// Unfortunately, we have lags here and thread isn't a solution :/
materialCalendarView.setCurrentDate(dateTimeCalendar.getTime());
materialCalendarView.setDateSelected(dateTimeCalendar, true);
// For resolve bug of switch year
materialCalendarView.goToNext();
materialCalendarView.goToPrevious();

yearHeaderValues.setText(String.valueOf(year));
}
});

Expand Down
98 changes: 41 additions & 57 deletions ...chdatetime/src/main/java/com/kunzisoft/switchdatetime/date/widget/ListPickerYearView.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,12 @@
import android.content.Context;
import android.content.res.Resources;
import android.content.res.TypedArray;
import android.graphics.drawable.StateListDrawable;
import android.os.Build;
import android.support.annotation.RequiresApi;
import android.support.v7.widget.LinearLayoutManager;
import android.support.v7.widget.RecyclerView;
import android.util.AttributeSet;
import android.util.Log;
import android.view.View;
import android.view.ViewGroup;
import android.widget.AdapterView;
import android.widget.ListView;
import android.widget.TextView;

import com.kunzisoft.switchdatetime.R;
import com.kunzisoft.switchdatetime.date.OnYearSelectedListener;
Expand All @@ -24,15 +21,17 @@
* @see com.kunzisoft.switchdatetime.date.OnYearSelectedListener#onYearSelected(View, int)
* @author JJamet
*/
public class ListPickerYearView extends ListView implements AdapterView.OnItemClickListener {
public class ListPickerYearView extends RecyclerView implements YearPickerAdapter.OnClickYearListener{

private final static String TAG = "ListPickerYearView";

private int minYear = 1970;
private int maxYear = 2100;
private int currentYear;

private YearPickerAdapter mAdapter;
private int mChildSize;
private OnYearSelectedListener yearChangeListener;
private int mChildSize;
private int mViewSize;

public ListPickerYearView(Context context) {
Expand All @@ -48,18 +47,14 @@ public ListPickerYearView(Context context, AttributeSet attrs, int defStyleAttr)
init(context, attrs);
}

@RequiresApi(api = Build.VERSION_CODES.LOLLIPOP)
public ListPickerYearView(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) {
super(context, attrs, defStyleAttr, defStyleRes);
init(context, attrs);
}

private void init(Context context, AttributeSet attrs) {
setLayoutManager(new LinearLayoutManager(context));

if(attrs != null) {
TypedArray yearTypedArray = getContext().obtainStyledAttributes(attrs, R.styleable.ListPickerYearView);
setMinYear(yearTypedArray.getInt(R.styleable.ListPickerYearView_minYear, minYear));
setMaxYear(yearTypedArray.getInt(R.styleable.ListPickerYearView_maxYear, minYear));
currentYear = yearTypedArray.getInt(R.styleable.ListPickerYearView_defaultYear, 2000);
currentYear = yearTypedArray.getInt(R.styleable.ListPickerYearView_defaultYear, YearPickerAdapter.UNDEFINED);
yearTypedArray.recycle();
}

Expand All @@ -72,12 +67,10 @@ private void init(Context context, AttributeSet attrs) {
setVerticalFadingEdgeEnabled(true);
setFadingEdgeLength(mChildSize / 3);

mAdapter = new YearPickerAdapter(getContext(), currentYear);
mAdapter = new YearPickerAdapter();
setAdapter(mAdapter);

setOnItemClickListener(this);
setSelector(new StateListDrawable());
setDividerHeight(0);
mAdapter.setOnClickYearListener(this);

refreshAndCenter();
}
Expand All @@ -91,7 +84,7 @@ private void injectYearsInAdapter() {
for (int year = minYear; year <= maxYear; year++) {
years.add(year);
}
mAdapter.replaceYearsBy(years);
mAdapter.setListYears(years);
mAdapter.notifyDataSetChanged();
}
}
Expand All @@ -105,51 +98,37 @@ public void refreshAndCenter() {
}

@Override
public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
public void onItemYearClick(View view, Integer year, int position) {
int positionOldYear = mAdapter.getPositionSelectedYear();
currentYear = year;

// TODO Vibrate
//mController.tryVibrate();
TextView clickedView = (TextView) view.findViewById(R.id.year_textView);
if (clickedView != null) {
currentYear = getYearFromTextView(clickedView);
if(yearChangeListener != null) {
yearChangeListener.onYearSelected(clickedView, getYearFromTextView(clickedView));
}
if(yearChangeListener != null) {
yearChangeListener.onYearSelected(view, year);
}

try {
mAdapter.setSelectedYear(currentYear);
mAdapter.notifyDataSetChanged();
} catch (YearPickerAdapter.SelectYearException e) {
Log.e(TAG, e.getMessage());
}
mAdapter.notifyDataSetChanged();
mAdapter.notifyItemChanged(positionOldYear);
mAdapter.notifyItemChanged(position);
}

/**
* Center list on the selected year
* @param position of year in the list
*/
public void centerListOn(int position) {
centerListOnWithTop(position, mViewSize / 2 - mChildSize / 2);
}

/**
* Center list on the selected year and add y at the top
* @param position of year in the list
* @param y pixels from top
*/
public void centerListOnWithTop(final int position, final int y) {
post(new Runnable() {
public void run() {
setSelectionFromTop(position, y);
requestLayout();
}
});
}

/**
* Get year integer from TextView
* @param view of text
* @return
*/
private static int getYearFromTextView(TextView view) {
if(view == null)
return 0;
return Integer.valueOf(view.getText().toString());
public void centerListOn(final int position) {
getLayoutManager().scrollToPosition(position);
try {
getLayoutManager().scrollVerticallyBy(mViewSize / 2 - mChildSize / 2, null, null);
} catch(Exception e){
Log.w(TAG, "Can't scroll more");
}
}

/**
Expand Down Expand Up @@ -208,8 +187,13 @@ public int getYearSelected() {
*/
public void assignCurrentYear(int year) {
currentYear = year;
if(mAdapter != null)
mAdapter.setSelectedYear(currentYear);
if(mAdapter != null) {
try {
mAdapter.setSelectedYear(currentYear);
} catch (YearPickerAdapter.SelectYearException e) {
Log.e(TAG, e.getMessage());
}
}
refreshAndCenter();
}
}
Loading

0 comments on commit 5ed0655

Please sign in to comment.