Merge pull request #250 from wncc/animfix

Fix Id, animation in profile

app/src/main/java/app/insti/adapter/CardAdapter.java

@@ -24,6 +24,7 @@ public abstract class CardAdapter<T extends CardInterface> extends RecyclerView.
 
     private List<T> tList;
     private Fragment mFragment;
+    public String uid = "";
 
     public void onClick(T t, FragmentActivity fragmentActivity) {};
     public void onClick(T t, Fragment fragment, View view) {}
@@ -68,14 +69,12 @@ public abstract class CardAdapter<T extends CardInterface> extends RecyclerView.
         viewHolder.subtitle.setText(t.getSubtitle());
 
         // Set transition names
-        // FIXME: Replace getTitle() with getId() once that is merged
-        viewHolder.avatar.setTransitionName(Integer.toString(t.getTitle().hashCode()) + "_sharedAvatar");
+        viewHolder.avatar.setTransitionName(uid + Integer.toString((int) t.getId()) + "_sharedAvatar");
 
         if (getBigImageUrl(t) != null) {
             // Show big image, hide avatar
             viewHolder.bigPicture.setVisibility(View.VISIBLE);
-            // FIXME: Replace getTitle() with getId() once that is merged
-            viewHolder.bigPicture.setTransitionName(Integer.toString(t.getTitle().hashCode()) + "_sharedBigPicture");
+            viewHolder.bigPicture.setTransitionName(uid + Integer.toString((int) t.getId()) + "_sharedBigPicture");
             viewHolder.avatar.setVisibility(View.GONE);
 
             // Load big image with low resolution as avatar

app/src/main/java/app/insti/fragment/BodyRecyclerViewFragment.java

@@ -76,6 +76,7 @@ public class BodyRecyclerViewFragment extends Fragment implements TransitionTarg
 
         recyclerView = (RecyclerView) getActivity().findViewById(R.id.body_recycler_view);
         bodyAdapter = new BodyAdapter(bodyList, this);
+        bodyAdapter.uid = "BRVFrag";
         recyclerView.setAdapter(bodyAdapter);
         recyclerView.setLayoutManager(new LinearLayoutManager(getContext()));
 

app/src/main/java/app/insti/fragment/RoleRecyclerViewFragment.java

@@ -72,6 +72,7 @@ public class RoleRecyclerViewFragment extends Fragment implements TransitionTarg
 
         recyclerView = (RecyclerView) getActivity().findViewById(R.id.role_recycler_view);
         roleAdapter = new RoleAdapter(roleList, this);
+        roleAdapter.uid = "RRVFrag";
         recyclerView.setAdapter(roleAdapter);
         recyclerView.setLayoutManager(new LinearLayoutManager(getContext()));