Linter issues

avalax · Jun 19, 2018 · 435248e · 435248e
1 parent 24438d0
commit 435248e
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 9 deletions.
diff --git a/src/main/java/de/avalax/fitbuddy/presentation/edit/workout/EditWorkoutFragment.java b/src/main/java/de/avalax/fitbuddy/presentation/edit/workout/EditWorkoutFragment.java
@@ -19,7 +19,6 @@
 
 import de.avalax.fitbuddy.R;
 import de.avalax.fitbuddy.databinding.EditWorkoutBinding;
-import de.avalax.fitbuddy.domain.model.exercise.BasicExercise;
 import de.avalax.fitbuddy.domain.model.exercise.Exercise;
 import de.avalax.fitbuddy.domain.model.exercise.ExerciseException;
 import de.avalax.fitbuddy.domain.model.workout.Workout;

diff --git a/src/main/java/de/avalax/fitbuddy/presentation/edit/workout/ExerciseAdapter.java b/src/main/java/de/avalax/fitbuddy/presentation/edit/workout/ExerciseAdapter.java
@@ -28,12 +28,13 @@ public class ExerciseAdapter extends RecyclerView.Adapter<ExerciseAdapter.Exerci
     private Exercises exercises;
 
     ExerciseAdapter(ExerciseViewHolderCallback callback) {
+        super();
         this.callback = callback;
         this.selections = new ArraySet<>();
     }
 
     public void setExercises(Exercises exercises) {
-        notifyItemRangeRemoved(0, exercises == null ? 0 : exercises.size());
+        notifyItemRangeRemoved(0, this.exercises == null ? 0 : this.exercises.size());
         this.exercises = exercises;
         notifyItemRangeInserted(0, exercises.size());
     }
@@ -46,7 +47,8 @@ public ExerciseViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int view
                         parent, false);
         binding.setCallback(callback);
         int highlightColor = parent.getResources().getColor(R.color.primaryLightColor);
-        ExerciseViewHolder exerciseViewHolder = new ExerciseViewHolder(binding, TRANSPARENT, highlightColor);
+        ExerciseViewHolder exerciseViewHolder =
+                new ExerciseViewHolder(binding, callback, selections, TRANSPARENT, highlightColor);
         exerciseViewHolder.setSelectionListener(this);
         return exerciseViewHolder;
     }
@@ -55,8 +57,8 @@ public ExerciseViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int view
     public void onBindViewHolder(@NonNull ExerciseViewHolder holder, int position) {
         try {
             Exercise exercise = exercises.get(position);
-            holder.binding.setExercise(exercise);
-            holder.binding.executePendingBindings();
+            holder.getBinding().setExercise(exercise);
+            holder.getBinding().executePendingBindings();
             holder.setSelected(selections.contains(exercise));
         } catch (ExerciseException e) {
             Log.e("ExerciseException", e.getMessage(), e);
@@ -95,14 +97,26 @@ public Set<Exercise> getSelections() {
         return selections;
     }
 
-    public class ExerciseViewHolder extends SelectableViewHolder {
+    public static class ExerciseViewHolder extends SelectableViewHolder {
         private final ExerciseItemBinding binding;
-
-        public ExerciseViewHolder(ExerciseItemBinding binding, int backgroundColor, int highlightColor) {
+        private final ExerciseViewHolderCallback callback;
+        private final Set<Exercise> selections;
+
+        ExerciseViewHolder(ExerciseItemBinding binding,
+                           ExerciseViewHolderCallback callback,
+                           Set<Exercise> selections,
+                           int backgroundColor,
+                           int highlightColor) {
             super(binding.getRoot(), backgroundColor, highlightColor);
+            this.selections = selections;
+            this.binding = binding;
+            this.callback = callback;
             binding.getRoot().setOnClickListener(this);
             binding.getRoot().setOnLongClickListener(this);
-            this.binding = binding;
+        }
+
+        ExerciseItemBinding getBinding() {
+            return binding;
         }
 
         @Override