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
4f32082f
Commit
4f32082f
authored
Nov 30, 2018
by
Varun Patil
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix event page without transition
parent
c9f229c8
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
9 additions
and
3 deletions
+9
-3
app/src/main/java/app/insti/Constants.java
app/src/main/java/app/insti/Constants.java
+1
-0
app/src/main/java/app/insti/Utils.java
app/src/main/java/app/insti/Utils.java
+4
-3
app/src/main/java/app/insti/fragment/EventFragment.java
app/src/main/java/app/insti/fragment/EventFragment.java
+4
-0
No files found.
app/src/main/java/app/insti/Constants.java
View file @
4f32082f
...
...
@@ -29,6 +29,7 @@ public class Constants {
public
static
final
String
BODY_JSON
=
"body_json"
;
public
static
final
String
BODY_LIST_JSON
=
"body_list_json"
;
public
static
final
String
ROLE_LIST_JSON
=
"role_list_json"
;
public
static
final
String
NO_SHARED_ELEM
=
"no_shared_elem"
;
public
static
final
String
LOGIN_MESSAGE
=
"Please login to continue!"
;
...
...
app/src/main/java/app/insti/Utils.java
View file @
4f32082f
...
...
@@ -156,24 +156,25 @@ public final class Utils {
);
}
public
static
EventFragment
getEventFragment
(
Event
event
)
{
public
static
EventFragment
getEventFragment
(
Event
event
,
boolean
sharedElements
)
{
String
eventJson
=
new
Gson
().
toJson
(
event
);
Bundle
bundle
=
new
Bundle
();
bundle
.
putString
(
Constants
.
EVENT_JSON
,
eventJson
);
bundle
.
putBoolean
(
Constants
.
NO_SHARED_ELEM
,
!
sharedElements
);
EventFragment
eventFragment
=
new
EventFragment
();
eventFragment
.
setArguments
(
bundle
);
return
eventFragment
;
}
public
static
void
openEventFragment
(
Event
event
,
FragmentActivity
fragmentActivity
)
{
updateFragment
(
getEventFragment
(
event
),
fragmentActivity
);
updateFragment
(
getEventFragment
(
event
,
false
),
fragmentActivity
);
}
public
static
void
openEventFragment
(
Event
event
,
Fragment
currentFragment
,
View
sharedAvatar
)
{
Map
<
View
,
String
>
sharedElements
=
new
HashMap
<>();
sharedElements
.
put
(
sharedAvatar
,
"sharedAvatar"
);
updateSharedElementFragment
(
getEventFragment
(
event
),
currentFragment
,
sharedElements
getEventFragment
(
event
,
true
),
currentFragment
,
sharedElements
);
}
...
...
app/src/main/java/app/insti/fragment/EventFragment.java
View file @
4f32082f
...
...
@@ -144,6 +144,10 @@ public class EventFragment extends BackHandledFragment implements TransitionTarg
Toolbar
toolbar
=
getActivity
().
findViewById
(
R
.
id
.
toolbar
);
toolbar
.
setTitle
(
event
.
getEventName
());
if
(
bundle
.
getBoolean
(
Constants
.
NO_SHARED_ELEM
,
true
))
{
this
.
transitionEnd
();
}
}
private
void
inflateViews
(
final
Event
event
)
{
...
...
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