eclipse-sailing-analytics/sailing-analytics
1
0 Fork 0
mirror of https://github.com/eclipse-sailing-analytics/sailing-analytics.git synced 2026-10-10 14:20:55 +00:00
Code Activity

Merge remote-tracking branch 'origin/ubilabs--rcapp--master'

Browse Source
This commit is contained in:
Simon Pamies committed 2015-06-19 16:07:49 +01:00
2 parents a7e3ba15a6 9e908b5cb5
commit a0c424b142
2 files changed
+14 -17
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/adapters/coursedesign/CourseMarkAdapter.java
+11 -14
View File
@@ -1,8 +1,5 @@
package com.sap.sailing.racecommittee.app.ui.adapters.coursedesign;
import java.util.ArrayList;
import java.util.List;
import android.content.Context;
import android.support.v7.widget.RecyclerView;
import android.view.LayoutInflater;
@@ -10,17 +7,19 @@ import android.view.View;
import android.view.ViewGroup;
import android.widget.ImageView;
import android.widget.TextView;
import com.sap.sailing.domain.base.Mark;
import com.sap.sailing.racecommittee.app.R;
import com.sap.sailing.racecommittee.app.ui.utils.MarkImageHelper;
import java.util.ArrayList;
import java.util.List;
public class CourseMarkAdapter extends RecyclerView.Adapter<CourseMarkAdapter.ViewHolder> {
private Context mContext;
private List<Mark> mMarks;
private MarkImageHelper mImageHelper;
private MarkLongClick mListener;
private MarkClick mListener;
public CourseMarkAdapter(Context context, ArrayList<Mark> marks, MarkImageHelper imageHelper) {
mContext = context;
@@ -52,15 +51,15 @@ public class CourseMarkAdapter extends RecyclerView.Adapter<CourseMarkAdapter.Vi
return 0;
}
public void setListener(MarkLongClick listener) {
public void setListener(MarkClick listener) {
mListener = listener;
}
public interface MarkLongClick {
void onItemLongClick(Mark mark);
public interface MarkClick {
void onItemClick(Mark mark);
}
public class ViewHolder extends RecyclerView.ViewHolder implements View.OnLongClickListener {
public class ViewHolder extends RecyclerView.ViewHolder implements View.OnClickListener {
public TextView textView;
public ImageView imageView;
@@ -68,18 +67,16 @@ public class CourseMarkAdapter extends RecyclerView.Adapter<CourseMarkAdapter.Vi
public ViewHolder(View itemView) {
super(itemView);
itemView.setOnLongClickListener(this);
itemView.setOnClickListener(this);
textView = (TextView) itemView.findViewById(R.id.cell_text);
imageView = (ImageView) itemView.findViewById(R.id.cell_image);
}
@Override
public boolean onLongClick(View v) {
public void onClick(View v) {
if (mListener != null) {
mListener.onItemLongClick(mMarks.get(getAdapterPosition()));
return true;
mListener.onItemClick(mMarks.get(getAdapterPosition()));
}
return false;
}
}
}
mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/fragments/raceinfo/CourseFragmentMarks.java
+3 -3
View File
@@ -36,7 +36,7 @@ import com.sap.sailing.racecommittee.app.ui.adapters.coursedesign.CourseElementA
import com.sap.sailing.racecommittee.app.ui.adapters.coursedesign.CourseElementAdapter.EventListener;
import com.sap.sailing.racecommittee.app.ui.adapters.coursedesign.CourseListDataElement;
import com.sap.sailing.racecommittee.app.ui.adapters.coursedesign.CourseMarkAdapter;
import com.sap.sailing.racecommittee.app.ui.adapters.coursedesign.CourseMarkAdapter.MarkLongClick;
import com.sap.sailing.racecommittee.app.ui.adapters.coursedesign.CourseMarkAdapter.MarkClick;
import com.sap.sailing.racecommittee.app.ui.comparators.NaturalNamedComparator;
import com.sap.sailing.racecommittee.app.ui.utils.ESSMarkImageHelper;
import com.sap.sailing.racecommittee.app.utils.BitmapHelper;
@@ -48,7 +48,7 @@ import java.util.Collection;
import java.util.Collections;
import java.util.List;
public class CourseFragmentMarks extends CourseFragment implements MarkLongClick, ElementLongClick, EventListener {
public class CourseFragmentMarks extends CourseFragment implements MarkClick, ElementLongClick, EventListener {
private RecyclerViewDragDropManager mDragDropManager;
private RecyclerViewSwipeManager mSwipeManager;
@@ -327,7 +327,7 @@ public class CourseFragmentMarks extends CourseFragment implements MarkLongClick
}
@Override
public void onItemLongClick(Mark mark) {
public void onItemClick(Mark mark) {
if (mElements.isEmpty()) {
addNewCourseElementToList(mark);
} else {