Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
I
InstiApp
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Analytics
Analytics
Repository
Value Stream
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Commits
Open sidebar
RAHUL SHARMA
InstiApp
Commits
c7df06fd
Commit
c7df06fd
authored
Dec 01, 2018
by
Varun Patil
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix shared element from profile (duplicate transition names)
parent
61b7c928
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
5 additions
and
2 deletions
+5
-2
app/src/main/java/app/insti/adapter/CardAdapter.java
app/src/main/java/app/insti/adapter/CardAdapter.java
+3
-2
app/src/main/java/app/insti/fragment/BodyRecyclerViewFragment.java
...ain/java/app/insti/fragment/BodyRecyclerViewFragment.java
+1
-0
app/src/main/java/app/insti/fragment/RoleRecyclerViewFragment.java
...ain/java/app/insti/fragment/RoleRecyclerViewFragment.java
+1
-0
No files found.
app/src/main/java/app/insti/adapter/CardAdapter.java
View file @
c7df06fd
...
@@ -24,6 +24,7 @@ public abstract class CardAdapter<T extends CardInterface> extends RecyclerView.
...
@@ -24,6 +24,7 @@ public abstract class CardAdapter<T extends CardInterface> extends RecyclerView.
private
List
<
T
>
tList
;
private
List
<
T
>
tList
;
private
Fragment
mFragment
;
private
Fragment
mFragment
;
public
String
uid
=
""
;
public
void
onClick
(
T
t
,
FragmentActivity
fragmentActivity
)
{};
public
void
onClick
(
T
t
,
FragmentActivity
fragmentActivity
)
{};
public
void
onClick
(
T
t
,
Fragment
fragment
,
View
view
)
{}
public
void
onClick
(
T
t
,
Fragment
fragment
,
View
view
)
{}
...
@@ -68,12 +69,12 @@ public abstract class CardAdapter<T extends CardInterface> extends RecyclerView.
...
@@ -68,12 +69,12 @@ public abstract class CardAdapter<T extends CardInterface> extends RecyclerView.
viewHolder
.
subtitle
.
setText
(
t
.
getSubtitle
());
viewHolder
.
subtitle
.
setText
(
t
.
getSubtitle
());
// Set transition names
// Set transition names
viewHolder
.
avatar
.
setTransitionName
(
Integer
.
toString
((
int
)
t
.
getId
())
+
"_sharedAvatar"
);
viewHolder
.
avatar
.
setTransitionName
(
uid
+
Integer
.
toString
((
int
)
t
.
getId
())
+
"_sharedAvatar"
);
if
(
getBigImageUrl
(
t
)
!=
null
)
{
if
(
getBigImageUrl
(
t
)
!=
null
)
{
// Show big image, hide avatar
// Show big image, hide avatar
viewHolder
.
bigPicture
.
setVisibility
(
View
.
VISIBLE
);
viewHolder
.
bigPicture
.
setVisibility
(
View
.
VISIBLE
);
viewHolder
.
bigPicture
.
setTransitionName
(
Integer
.
toString
((
int
)
t
.
getId
())
+
"_sharedBigPicture"
);
viewHolder
.
bigPicture
.
setTransitionName
(
uid
+
Integer
.
toString
((
int
)
t
.
getId
())
+
"_sharedBigPicture"
);
viewHolder
.
avatar
.
setVisibility
(
View
.
GONE
);
viewHolder
.
avatar
.
setVisibility
(
View
.
GONE
);
// Load big image with low resolution as avatar
// Load big image with low resolution as avatar
...
...
app/src/main/java/app/insti/fragment/BodyRecyclerViewFragment.java
View file @
c7df06fd
...
@@ -76,6 +76,7 @@ public class BodyRecyclerViewFragment extends Fragment implements TransitionTarg
...
@@ -76,6 +76,7 @@ public class BodyRecyclerViewFragment extends Fragment implements TransitionTarg
recyclerView
=
(
RecyclerView
)
getActivity
().
findViewById
(
R
.
id
.
body_recycler_view
);
recyclerView
=
(
RecyclerView
)
getActivity
().
findViewById
(
R
.
id
.
body_recycler_view
);
bodyAdapter
=
new
BodyAdapter
(
bodyList
,
this
);
bodyAdapter
=
new
BodyAdapter
(
bodyList
,
this
);
bodyAdapter
.
uid
=
"BRVFrag"
;
recyclerView
.
setAdapter
(
bodyAdapter
);
recyclerView
.
setAdapter
(
bodyAdapter
);
recyclerView
.
setLayoutManager
(
new
LinearLayoutManager
(
getContext
()));
recyclerView
.
setLayoutManager
(
new
LinearLayoutManager
(
getContext
()));
...
...
app/src/main/java/app/insti/fragment/RoleRecyclerViewFragment.java
View file @
c7df06fd
...
@@ -72,6 +72,7 @@ public class RoleRecyclerViewFragment extends Fragment implements TransitionTarg
...
@@ -72,6 +72,7 @@ public class RoleRecyclerViewFragment extends Fragment implements TransitionTarg
recyclerView
=
(
RecyclerView
)
getActivity
().
findViewById
(
R
.
id
.
role_recycler_view
);
recyclerView
=
(
RecyclerView
)
getActivity
().
findViewById
(
R
.
id
.
role_recycler_view
);
roleAdapter
=
new
RoleAdapter
(
roleList
,
this
);
roleAdapter
=
new
RoleAdapter
(
roleList
,
this
);
roleAdapter
.
uid
=
"RRVFrag"
;
recyclerView
.
setAdapter
(
roleAdapter
);
recyclerView
.
setAdapter
(
roleAdapter
);
recyclerView
.
setLayoutManager
(
new
LinearLayoutManager
(
getContext
()));
recyclerView
.
setLayoutManager
(
new
LinearLayoutManager
(
getContext
()));
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment