moved all request codes to one place

avalax · Jan 12, 2018 · c334149 · c334149
1 parent 1679f0c
commit c334149
Show file tree

Hide file tree

Showing 9 changed files with 39 additions and 30 deletions.
diff --git a/src/main/java/de/avalax/fitbuddy/presentation/MainActivity.java b/src/main/java/de/avalax/fitbuddy/presentation/MainActivity.java
@@ -31,11 +31,12 @@
 
 import static android.widget.Toast.LENGTH_SHORT;
 import static android.widget.Toast.makeText;
+import static de.avalax.fitbuddy.presentation.RequestCodes.ADD_WORKOUT;
+import static de.avalax.fitbuddy.presentation.RequestCodes.EDIT_WORKOUT;
 
 public class MainActivity extends AppCompatActivity
         implements BottomNavigationView.OnNavigationItemSelectedListener {
 
-    public static final int EDIT_WORKOUT = 2;
     private Menu menu;
     private BottomNavigationView bottomNavigation;
     @Inject
@@ -102,13 +103,23 @@ public boolean onOptionsItemSelected(MenuItem item) {
     @Override
     protected void onActivityResult(int requestCode, int resultCode, Intent data) {
         super.onActivityResult(requestCode, resultCode, data);
+        if (requestCode == ADD_WORKOUT && resultCode == Activity.RESULT_OK) {
+            Workout workout = (Workout) data.getSerializableExtra("workout");
+            addWorkoutToList(workout);
+        }
         if (requestCode == EDIT_WORKOUT && resultCode == Activity.RESULT_OK) {
             Workout workout = (Workout) data.getSerializableExtra("workout");
             Integer position = data.getIntExtra("position", -1);
             updateWorkoutInList(position, workout);
         }
     }
 
+    private void addWorkoutToList(Workout workout) {
+        WorkoutListFragment workoutListFragment = (WorkoutListFragment)
+                getSupportFragmentManager().findFragmentById(R.id.fragment_content);
+        workoutListFragment.addWorkout(workout);
+    }
+
     private void updateWorkoutInList(Integer position, Workout workout) {
         WorkoutListFragment workoutListFragment = (WorkoutListFragment)
                 getSupportFragmentManager().findFragmentById(R.id.fragment_content);

diff --git a/src/main/java/de/avalax/fitbuddy/presentation/RequestCodes.java b/src/main/java/de/avalax/fitbuddy/presentation/RequestCodes.java
@@ -0,0 +1,11 @@
+package de.avalax.fitbuddy.presentation;
+
+public class RequestCodes {
+    public static final int ADD_WORKOUT = 1;
+    public static final int EDIT_WORKOUT = 2;
+    public static final int ADD_EXERCISE = 3;
+    public static final int EDIT_EXERCISE = 4;
+    public static final int ADD_SET = 5;
+    public static final int EDIT_SET = 6;
+    public static final int FINISHED_WORKOUT_DETAILS = 7;
+}
diff --git a/src/main/java/de/avalax/fitbuddy/presentation/edit/exercise/EditExerciseActivity.java b/src/main/java/de/avalax/fitbuddy/presentation/edit/exercise/EditExerciseActivity.java
@@ -19,12 +19,11 @@
 
 import static android.widget.Toast.LENGTH_SHORT;
 import static android.widget.Toast.makeText;
+import static de.avalax.fitbuddy.presentation.RequestCodes.ADD_SET;
+import static de.avalax.fitbuddy.presentation.RequestCodes.EDIT_SET;
 import static java.lang.String.valueOf;
 
 public class EditExerciseActivity extends AppCompatActivity {
-
-    public static final int EDIT_SET = 5;
-    public static final int ADD_SET = 6;
     private EditText nameEditText;
     private Exercise exercise;
     private Menu menu;

diff --git a/src/main/java/de/avalax/fitbuddy/presentation/edit/exercise/SetAdapter.java b/src/main/java/de/avalax/fitbuddy/presentation/edit/exercise/SetAdapter.java
@@ -18,7 +18,7 @@
 import de.avalax.fitbuddy.presentation.edit.set.EditSetActivity;
 
 import static android.graphics.Color.TRANSPARENT;
-import static de.avalax.fitbuddy.presentation.edit.exercise.EditExerciseActivity.EDIT_SET;
+import static de.avalax.fitbuddy.presentation.RequestCodes.EDIT_SET;
 
 public class SetAdapter extends RecyclerView.Adapter<SetAdapter.SetViewHolder> {
     private Sets sets;

diff --git a/src/main/java/de/avalax/fitbuddy/presentation/edit/workout/EditWorkoutActivity.java b/src/main/java/de/avalax/fitbuddy/presentation/edit/workout/EditWorkoutActivity.java
@@ -25,12 +25,11 @@
 
 import static android.widget.Toast.LENGTH_SHORT;
 import static android.widget.Toast.makeText;
+import static de.avalax.fitbuddy.presentation.RequestCodes.ADD_EXERCISE;
+import static de.avalax.fitbuddy.presentation.RequestCodes.EDIT_EXERCISE;
 import static java.lang.String.valueOf;
 
 public class EditWorkoutActivity extends AppCompatActivity {
-
-    public static final int ADD_EXERCISE = 3;
-    public static final int EDIT_EXERCISE = 4;
     @Inject
     EditWorkoutService editWorkoutService;
     private EditText nameEditText;

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
@@ -20,7 +20,7 @@
 import de.avalax.fitbuddy.presentation.edit.exercise.EditExerciseActivity;
 
 import static android.graphics.Color.TRANSPARENT;
-import static de.avalax.fitbuddy.presentation.edit.workout.EditWorkoutActivity.EDIT_EXERCISE;
+import static de.avalax.fitbuddy.presentation.RequestCodes.EDIT_EXERCISE;
 
 public class ExerciseAdapter extends RecyclerView.Adapter<ExerciseAdapter.ExerciseViewHolder> {
     private Exercises exercises;

diff --git a/src/main/java/de/avalax/fitbuddy/presentation/summary/FinishedWorkoutAdapter.java b/src/main/java/de/avalax/fitbuddy/presentation/summary/FinishedWorkoutAdapter.java
@@ -14,7 +14,7 @@
 import de.avalax.fitbuddy.presentation.MainActivity;
 import de.avalax.fitbuddy.presentation.edit.SelectableViewHolder;
 
-import static de.avalax.fitbuddy.presentation.summary.FinishedWorkoutDetailActivity.FINISHED_WORKOUT_DETAILS;
+import static de.avalax.fitbuddy.presentation.RequestCodes.FINISHED_WORKOUT_DETAILS;
 import static de.avalax.fitbuddy.presentation.summary.FinishedWorkoutDetailFragment.ARGS_FINISHED_WORKOUT;
 
 public class FinishedWorkoutAdapter

diff --git a/src/main/java/de/avalax/fitbuddy/presentation/summary/FinishedWorkoutDetailActivity.java b/src/main/java/de/avalax/fitbuddy/presentation/summary/FinishedWorkoutDetailActivity.java
@@ -15,9 +15,6 @@
 import static de.avalax.fitbuddy.presentation.summary.FinishedWorkoutDetailFragment.ARGS_FINISHED_WORKOUT;
 
 public class FinishedWorkoutDetailActivity extends AppCompatActivity {
-
-    public static final int FINISHED_WORKOUT_DETAILS = 5;
-
     @Inject
     protected EditExerciseViewHelper editExerciseViewHelper;
 

diff --git a/src/main/java/de/avalax/fitbuddy/presentation/welcome_screen/WorkoutListFragment.java b/src/main/java/de/avalax/fitbuddy/presentation/welcome_screen/WorkoutListFragment.java
@@ -1,6 +1,5 @@
 package de.avalax.fitbuddy.presentation.welcome_screen;
 
-import android.app.Activity;
 import android.content.Intent;
 import android.os.Bundle;
 import android.support.design.widget.FloatingActionButton;
@@ -28,10 +27,9 @@
 import de.avalax.fitbuddy.presentation.edit.workout.EditWorkoutActivity;
 import de.avalax.fitbuddy.presentation.summary.FinishedWorkoutViewHelper;
 
-public class WorkoutListFragment extends Fragment implements View.OnClickListener {
-
-    private static final int ADD_WORKOUT = 1;
+import static de.avalax.fitbuddy.presentation.RequestCodes.ADD_WORKOUT;
 
+public class WorkoutListFragment extends Fragment implements View.OnClickListener {
     @Inject
     EditWorkoutService editWorkoutService;
 
@@ -69,11 +67,16 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container,
         return view;
     }
 
+    public void addWorkout(Workout workout) {
+        workouts.add(workout);
+        workoutAdapter.notifyItemInserted(workouts.size() - 1);
+        recyclerView.updateEmptyView();
+    }
+
     public void updateWorkout(Integer position, Workout workout) {
         workouts.set(position, workout);
         workoutAdapter.notifyItemChanged(position);
         recyclerView.updateEmptyView();
-        ((MainActivity) getActivity()).mainToolbar();
     }
 
     public void removeSelection() {
@@ -92,18 +95,7 @@ public void removeWorkout(Workout workout) {
     public void onClick(View view) {
         Intent intent = new Intent(getActivity(), EditWorkoutActivity.class);
         intent.putExtra("workout", new BasicWorkout());
-        startActivityForResult(intent, ADD_WORKOUT);
-    }
-
-    @Override
-    public void onActivityResult(int requestCode, int resultCode, Intent data) {
-        super.onActivityResult(requestCode, resultCode, data);
-        if (requestCode == ADD_WORKOUT && resultCode == Activity.RESULT_OK) {
-            Workout workout = (Workout) data.getSerializableExtra("workout");
-            workouts.add(workout);
-            workoutAdapter.notifyItemInserted(workouts.size() - 1);
-            recyclerView.updateEmptyView();
-        }
+        getActivity().startActivityForResult(intent, ADD_WORKOUT);
     }
 }