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
c9f229c8
Commit
c9f229c8
authored
Nov 30, 2018
by
Varun Patil
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix going back to user fragment
parent
354921dc
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
33 additions
and
4 deletions
+33
-4
app/src/main/java/app/insti/Utils.java
app/src/main/java/app/insti/Utils.java
+8
-1
app/src/main/java/app/insti/fragment/BodyRecyclerViewFragment.java
...ain/java/app/insti/fragment/BodyRecyclerViewFragment.java
+6
-1
app/src/main/java/app/insti/fragment/EventRecyclerViewFragment.java
...in/java/app/insti/fragment/EventRecyclerViewFragment.java
+6
-1
app/src/main/java/app/insti/fragment/RoleRecyclerViewFragment.java
...ain/java/app/insti/fragment/RoleRecyclerViewFragment.java
+6
-1
app/src/main/java/app/insti/fragment/TransitionTargetChild.java
...c/main/java/app/insti/fragment/TransitionTargetChild.java
+7
-0
No files found.
app/src/main/java/app/insti/Utils.java
View file @
c9f229c8
...
...
@@ -5,10 +5,10 @@ import android.content.Context;
import
android.content.Intent
;
import
android.net.Uri
;
import
android.os.Bundle
;
import
android.support.design.widget.NavigationView
;
import
android.support.transition.Fade
;
import
android.support.transition.Slide
;
import
android.support.transition.Transition
;
import
android.support.design.widget.NavigationView
;
import
android.support.v4.app.Fragment
;
import
android.support.v4.app.FragmentActivity
;
import
android.support.v4.app.FragmentTransaction
;
...
...
@@ -20,6 +20,7 @@ import com.google.gson.Gson;
import
com.squareup.picasso.Callback
;
import
com.squareup.picasso.Picasso
;
import
java.lang.reflect.Field
;
import
java.util.HashMap
;
import
java.util.Map
;
...
...
@@ -30,6 +31,7 @@ import app.insti.api.model.Event;
import
app.insti.api.model.User
;
import
app.insti.fragment.BodyFragment
;
import
app.insti.fragment.EventFragment
;
import
app.insti.fragment.TransitionTargetChild
;
import
app.insti.fragment.TransitionTargetFragment
;
import
app.insti.fragment.UserFragment
;
...
...
@@ -92,6 +94,11 @@ public final class Utils {
currentFragment
.
setExitTransition
(
new
Fade
());
fragment
.
setSharedElementReturnTransition
(
transition
);
/* Set transition for parent in case it is a child */
if
(
currentFragment
instanceof
TransitionTargetChild
)
{
((
TransitionTargetChild
)
currentFragment
).
getParent
().
setExitTransition
(
new
Fade
());
}
transition
.
addListener
(
new
Transition
.
TransitionListener
()
{
@Override
public
void
onTransitionStart
(
Transition
transition
)
{
...
...
app/src/main/java/app/insti/fragment/BodyRecyclerViewFragment.java
View file @
c9f229c8
...
...
@@ -26,7 +26,7 @@ import app.insti.api.model.Body;
* Use the {@link BodyRecyclerViewFragment#newInstance} factory method to
* create an instance of this fragment.
*/
public
class
BodyRecyclerViewFragment
extends
Fragment
implements
TransitionTargetFragment
{
public
class
BodyRecyclerViewFragment
extends
Fragment
implements
TransitionTargetFragment
,
TransitionTargetChild
{
private
static
final
String
TAG
=
"BodyRecyclerViewFragment"
;
public
Fragment
parentFragment
=
null
;
...
...
@@ -46,6 +46,11 @@ public class BodyRecyclerViewFragment extends Fragment implements TransitionTarg
}
}
@Override
public
Fragment
getParent
()
{
return
parentFragment
;
}
// TODO: Rename and change types and number of parameters
public
static
BodyRecyclerViewFragment
newInstance
(
List
<
Body
>
bodyList
)
{
BodyRecyclerViewFragment
fragment
=
new
BodyRecyclerViewFragment
();
...
...
app/src/main/java/app/insti/fragment/EventRecyclerViewFragment.java
View file @
c9f229c8
...
...
@@ -25,7 +25,7 @@ import app.insti.api.model.Event;
* Use the {@link EventRecyclerViewFragment#newInstance} factory method to
* create an instance of this fragment.
*/
public
class
EventRecyclerViewFragment
extends
Fragment
implements
TransitionTargetFragment
{
public
class
EventRecyclerViewFragment
extends
Fragment
implements
TransitionTargetFragment
,
TransitionTargetChild
{
private
static
final
String
TAG
=
"EventRecyclerViewFragment"
;
public
Fragment
parentFragment
=
null
;
...
...
@@ -45,6 +45,11 @@ public class EventRecyclerViewFragment extends Fragment implements TransitionTar
}
}
@Override
public
Fragment
getParent
()
{
return
parentFragment
;
}
// TODO: Rename and change types and number of parameters
public
static
EventRecyclerViewFragment
newInstance
(
List
<
Event
>
eventList
)
{
EventRecyclerViewFragment
fragment
=
new
EventRecyclerViewFragment
();
...
...
app/src/main/java/app/insti/fragment/RoleRecyclerViewFragment.java
View file @
c9f229c8
...
...
@@ -23,7 +23,7 @@ import app.insti.api.model.Role;
* Use the {@link RoleRecyclerViewFragment#newInstance} factory method to
* create an instance of this fragment.
*/
public
class
RoleRecyclerViewFragment
extends
Fragment
implements
TransitionTargetFragment
{
public
class
RoleRecyclerViewFragment
extends
Fragment
implements
TransitionTargetFragment
,
TransitionTargetChild
{
private
static
final
String
TAG
=
"RoleRecyclerViewFragment"
;
public
Fragment
parentFragment
=
null
;
...
...
@@ -43,6 +43,11 @@ public class RoleRecyclerViewFragment extends Fragment implements TransitionTarg
}
}
@Override
public
Fragment
getParent
()
{
return
parentFragment
;
}
// TODO: Rename and change types and number of parameters
public
static
RoleRecyclerViewFragment
newInstance
(
List
<
Role
>
roleList
)
{
RoleRecyclerViewFragment
fragment
=
new
RoleRecyclerViewFragment
();
...
...
app/src/main/java/app/insti/fragment/TransitionTargetChild.java
0 → 100644
View file @
c9f229c8
package
app.insti.fragment
;
import
android.support.v4.app.Fragment
;
public
interface
TransitionTargetChild
{
Fragment
getParent
();
}
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