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
4e42bed8
Commit
4e42bed8
authored
Jun 28, 2018
by
Varun Patil
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add some animations
parent
5a98fc28
Changes
8
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
47 additions
and
0 deletions
+47
-0
app/src/main/java/in/ac/iitb/gymkhana/iitbapp/MainActivity.java
...c/main/java/in/ac/iitb/gymkhana/iitbapp/MainActivity.java
+7
-0
app/src/main/java/in/ac/iitb/gymkhana/iitbapp/fragment/BodyFragment.java
...va/in/ac/iitb/gymkhana/iitbapp/fragment/BodyFragment.java
+1
-0
app/src/main/java/in/ac/iitb/gymkhana/iitbapp/fragment/EventFragment.java
...a/in/ac/iitb/gymkhana/iitbapp/fragment/EventFragment.java
+1
-0
app/src/main/java/in/ac/iitb/gymkhana/iitbapp/fragment/FeedFragment.java
...va/in/ac/iitb/gymkhana/iitbapp/fragment/FeedFragment.java
+2
-0
app/src/main/res/anim/slide_in_left.xml
app/src/main/res/anim/slide_in_left.xml
+9
-0
app/src/main/res/anim/slide_in_right.xml
app/src/main/res/anim/slide_in_right.xml
+9
-0
app/src/main/res/anim/slide_out_left.xml
app/src/main/res/anim/slide_out_left.xml
+9
-0
app/src/main/res/anim/slide_out_right.xml
app/src/main/res/anim/slide_out_right.xml
+9
-0
No files found.
app/src/main/java/in/ac/iitb/gymkhana/iitbapp/MainActivity.java
View file @
4e42bed8
...
...
@@ -291,7 +291,14 @@ public class MainActivity extends AppCompatActivity implements NavigationView.On
FragmentManager
manager
=
getSupportFragmentManager
();
if
(
fragment
instanceof
FeedFragment
)
manager
.
popBackStack
(
null
,
FragmentManager
.
POP_BACK_STACK_INCLUSIVE
);
FragmentTransaction
transaction
=
manager
.
beginTransaction
();
/* Animate only for ProfileFragment */
if
(
fragment
instanceof
ProfileFragment
)
{
transaction
.
setCustomAnimations
(
R
.
anim
.
slide_in_left
,
R
.
anim
.
slide_out_left
,
R
.
anim
.
slide_in_right
,
R
.
anim
.
slide_out_right
);
}
transaction
.
replace
(
R
.
id
.
framelayout_for_fragment
,
fragment
,
fragment
.
getTag
());
transaction
.
addToBackStack
(
fragment
.
getTag
()).
commit
();
}
...
...
app/src/main/java/in/ac/iitb/gymkhana/iitbapp/fragment/BodyFragment.java
View file @
4e42bed8
...
...
@@ -204,6 +204,7 @@ public class BodyFragment extends Fragment {
EventFragment
eventFragment
=
new
EventFragment
();
eventFragment
.
setArguments
(
bundle
);
FragmentTransaction
ft
=
getActivity
().
getSupportFragmentManager
().
beginTransaction
();
ft
.
setCustomAnimations
(
R
.
anim
.
slide_in_left
,
R
.
anim
.
slide_out_left
,
R
.
anim
.
slide_in_right
,
R
.
anim
.
slide_out_right
);
ft
.
replace
(
R
.
id
.
framelayout_for_fragment
,
eventFragment
,
eventFragment
.
getTag
());
ft
.
addToBackStack
(
eventFragment
.
getTag
());
ft
.
commit
();
...
...
app/src/main/java/in/ac/iitb/gymkhana/iitbapp/fragment/EventFragment.java
View file @
4e42bed8
...
...
@@ -119,6 +119,7 @@ public class EventFragment extends BaseFragment {
Body
body
=
bodyList
.
get
(
position
);
BodyFragment
bodyFragment
=
BodyFragment
.
newInstance
(
body
);
FragmentTransaction
ft
=
getActivity
().
getSupportFragmentManager
().
beginTransaction
();
ft
.
setCustomAnimations
(
R
.
anim
.
slide_in_left
,
R
.
anim
.
slide_out_left
,
R
.
anim
.
slide_in_right
,
R
.
anim
.
slide_out_right
);
ft
.
replace
(
R
.
id
.
framelayout_for_fragment
,
bodyFragment
,
bodyFragment
.
getTag
());
ft
.
addToBackStack
(
bodyFragment
.
getTag
());
ft
.
commit
();
...
...
app/src/main/java/in/ac/iitb/gymkhana/iitbapp/fragment/FeedFragment.java
View file @
4e42bed8
...
...
@@ -64,6 +64,7 @@ public class FeedFragment extends BaseFragment {
AddEventFragment
addEventFragment
=
new
AddEventFragment
();
addEventFragment
.
setArguments
(
getArguments
());
FragmentTransaction
ft
=
getChildFragmentManager
().
beginTransaction
();
ft
.
setCustomAnimations
(
R
.
anim
.
slide_in_left
,
R
.
anim
.
slide_out_left
,
R
.
anim
.
slide_in_right
,
R
.
anim
.
slide_out_right
);
ft
.
replace
(
R
.
id
.
relative_layout
,
addEventFragment
);
ft
.
addToBackStack
(
"addEvent"
);
ft
.
commit
();
...
...
@@ -146,6 +147,7 @@ public class FeedFragment extends BaseFragment {
eventFragment
.
setArguments
(
bundle
);
FragmentManager
manager
=
getActivity
().
getSupportFragmentManager
();
FragmentTransaction
transaction
=
manager
.
beginTransaction
();
transaction
.
setCustomAnimations
(
R
.
anim
.
slide_in_left
,
R
.
anim
.
slide_out_left
,
R
.
anim
.
slide_in_right
,
R
.
anim
.
slide_out_right
);
transaction
.
replace
(
R
.
id
.
framelayout_for_fragment
,
eventFragment
,
eventFragment
.
getTag
());
transaction
.
addToBackStack
(
eventFragment
.
getTag
()).
commit
();
}
...
...
app/src/main/res/anim/slide_in_left.xml
0 → 100644
View file @
4e42bed8
<?xml version="1.0" encoding="utf-8"?>
<set>
<objectAnimator
xmlns:android=
"http://schemas.android.com/apk/res/android"
android:propertyName=
"x"
android:valueType=
"floatType"
android:valueFrom=
"1280"
android:valueTo=
"0"
android:duration=
"400"
/>
</set>
\ No newline at end of file
app/src/main/res/anim/slide_in_right.xml
0 → 100644
View file @
4e42bed8
<?xml version="1.0" encoding="utf-8"?>
<set>
<objectAnimator
xmlns:android=
"http://schemas.android.com/apk/res/android"
android:propertyName=
"x"
android:valueType=
"floatType"
android:valueFrom=
"-1280"
android:valueTo=
"0"
android:duration=
"400"
/>
</set>
\ No newline at end of file
app/src/main/res/anim/slide_out_left.xml
0 → 100644
View file @
4e42bed8
<?xml version="1.0" encoding="utf-8"?>
<set>
<objectAnimator
xmlns:android=
"http://schemas.android.com/apk/res/android"
android:propertyName=
"x"
android:valueType=
"floatType"
android:valueFrom=
"0"
android:valueTo=
"-1280"
android:duration=
"400"
/>
</set>
\ No newline at end of file
app/src/main/res/anim/slide_out_right.xml
0 → 100644
View file @
4e42bed8
<?xml version="1.0" encoding="utf-8"?>
<set>
<objectAnimator
xmlns:android=
"http://schemas.android.com/apk/res/android"
android:propertyName=
"x"
android:valueType=
"floatType"
android:valueFrom=
"0"
android:valueTo=
"1280"
android:duration=
"400"
/>
</set>
\ No newline at end of file
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